More rename, more -python2

jellypy/macos.py

@@ -16,13 +16,14 @@
 #  along with Tautulli.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import plistlib
 import subprocess
 import sys
-import plistlib
 
 try:
     import AppKit
     import Foundation
+
     HAS_PYOBJC = True
 except ImportError:
     HAS_PYOBJC = False
@@ -31,14 +32,10 @@ if HAS_PYOBJC:
     import rumps
 
 import jellypy
-if jellypy.PYTHON2:
-    import common
-    import logger
-    import versioncheck
-else:
-    from jellypy import common
-    from jellypy import logger
-    from jellypy import versioncheck
+
+from jellypy import common
+from jellypy import logger
+from jellypy import versioncheck
 
 
 class MacOSSystemTray(object):