More rename, more -python2

jellypy/web_socket.py

@@ -17,9 +17,6 @@
 
 # Mostly borrowed from https://github.com/trakt/Plex-Trakt-Scrobbler
 
-from __future__ import unicode_literals
-from future.builtins import str
-
 import json
 import ssl
 import threading
@@ -29,19 +26,11 @@ import certifi
 import websocket
 
 import jellypy
-if jellypy.PYTHON2:
-    import activity_handler
-    import activity_pinger
-    import activity_processor
-    import database
-    import logger
-else:
-    from jellypy import activity_handler
-    from jellypy import activity_pinger
-    from jellypy import activity_processor
-    from jellypy import database
-    from jellypy import logger
-
+from jellypy import activity_handler
+from jellypy import activity_pinger
+from jellypy import activity_processor
+from jellypy import database
+from jellypy import logger
 
 name = 'websocket'
 opcode_data = (websocket.ABNF.OPCODE_TEXT, websocket.ABNF.OPCODE_BINARY)