Add function to initialize plexapi

plexpy/__init__.py

@@ -53,6 +53,7 @@ if PYTHON2:
     import newsletter_handler
     import notification_handler
     import notifiers
+    import plex
     import plextv
     import users
     import versioncheck
@@ -73,6 +74,7 @@ else:
     from plexpy import newsletter_handler
     from plexpy import notification_handler
     from plexpy import notifiers
+    from plexpy import plex
     from plexpy import plextv
     from plexpy import users
     from plexpy import versioncheck
@@ -206,14 +208,10 @@ def initialize(config_file):
         logger.initLogger(console=not QUIET, log_dir=CONFIG.LOG_DIR if log_writable else None,
                           verbose=VERBOSE)
 
+        if not PYTHON2:
             os.environ['PLEXAPI_CONFIG_PATH'] = os.path.join(DATA_DIR, 'plexapi.config.ini')
             os.environ['PLEXAPI_LOG_PATH'] = os.path.join(CONFIG.LOG_DIR, 'plexapi.log')
-        try:
-            import plexapi
-            import importlib
-            importlib.reload(plexapi)
-        except:
-            pass
+            plex.initialize_plexapi()
 
         if DOCKER:
             build = '[Docker] '

plexpy/plex.py

@@ -19,8 +19,6 @@ from __future__ import unicode_literals
 from future.builtins import object
 from future.builtins import str
 
-import sys
-
 import plexpy
 if plexpy.PYTHON2:
     import logger
@@ -45,17 +43,20 @@ class DummyObject(object):
         raise StopIteration
 
 
-if sys.version_info >= (3, 6):
+PlexObject = DummyObject
+
+
+def initialize_plexapi():
     from plexapi.server import PlexServer
-else:
-    PlexServer = DummyObject
+    global PlexObject
+    PlexObject = PlexServer
 
 
 class Plex(object):
     def __init__(self, url=None, token=None):
         url = url or plexpy.CONFIG.PMS_URL
         token = token or plexpy.CONFIG.PMS_TOKEN
-        self.plex = PlexServer(url, token)
+        self.plex = PlexObject(url, token)
 
     def get_library(self, section_id):
         return self.plex.library.sectionByID(str(section_id))