More rename, more -python2

jellypy/versioncheck.py

@@ -15,11 +15,6 @@
 #  You should have received a copy of the GNU General Public License
 #  along with Tautulli.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import division
-from __future__ import unicode_literals
-from future.builtins import next
-from future.builtins import str
-
 import json
 import os
 import platform
@@ -28,20 +23,13 @@ import subprocess
 import tarfile
 
 import jellypy
-if jellypy.PYTHON2:
-    import common
-    import helpers
-    import logger
-    import request
-else:
-    from jellypy import common
-    from jellypy import helpers
-    from jellypy import logger
-    from jellypy import request
+from jellypy import common
+from jellypy import helpers
+from jellypy import logger
+from jellypy import request
 
 
 def runGit(args):
-
     if jellypy.CONFIG.GIT_PATH:
         git_locations = ['"' + jellypy.CONFIG.GIT_PATH + '"']
     else:
@@ -57,7 +45,8 @@ def runGit(args):
 
         try:
             logger.debug('Trying to execute: "' + cmd + '" with shell in ' + jellypy.PROG_DIR)
-            p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, cwd=jellypy.PROG_DIR)
+            p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True,
+                                 cwd=jellypy.PROG_DIR)
             output, err = p.communicate()
             output = output.strip().decode()
 
@@ -79,7 +68,6 @@ def runGit(args):
 
 
 def get_version():
-
     if jellypy.FROZEN and common.PLATFORM == 'Windows':
         jellypy.INSTALL_TYPE = 'windows'
         current_version, current_branch = get_version_from_file()
@@ -270,9 +258,9 @@ def check_github(scheduler=False, notify=False, use_cache=False):
 
         if notify:
             jellypy.NOTIFY_QUEUE.put({'notify_action': 'on_plexpyupdate',
-                                     'plexpy_download_info': release,
-                                     'plexpy_update_commit': jellypy.LATEST_VERSION,
-                                     'plexpy_update_behind': jellypy.COMMITS_BEHIND})
+                                      'plexpy_download_info': release,
+                                      'plexpy_update_commit': jellypy.LATEST_VERSION,
+                                      'plexpy_update_behind': jellypy.COMMITS_BEHIND})
 
         if jellypy.PYTHON2:
             logger.warn('Tautulli is running using Python 2. Unable to run automatic update.')