Fix imports for Python 2

plexpy/__init__.py

@@ -40,24 +40,46 @@ from apscheduler.triggers.interval import IntervalTrigger
 from UniversalAnalytics import Tracker
 import pytz
 
-from plexpy import activity_handler
+PYTHON_VERSION = sys.version_info[0]
-from plexpy import activity_pinger
+
-from plexpy import common
+if PYTHON_VERSION < 3:
-from plexpy import database
+    import activity_handler
-from plexpy import datafactory
+    import activity_pinger
-from plexpy import libraries
+    import common
-from plexpy import logger
+    import database
-from plexpy import mobile_app
+    import datafactory
-from plexpy import newsletters
+    import libraries
-from plexpy import newsletter_handler
+    import logger
-from plexpy import notification_handler
+    import mobile_app
-from plexpy import notifiers
+    import newsletters
-from plexpy import plextv
+    import newsletter_handler
-from plexpy import users
+    import notification_handler
-from plexpy import versioncheck
+    import notifiers
-from plexpy import web_socket
+    import plextv
-from plexpy import webstart
+    import users
-from plexpy import config
+    import versioncheck
+    import web_socket
+    import webstart
+    import config
+else:
+    from plexpy import activity_handler
+    from plexpy import activity_pinger
+    from plexpy import common
+    from plexpy import database
+    from plexpy import datafactory
+    from plexpy import libraries
+    from plexpy import logger
+    from plexpy import mobile_app
+    from plexpy import newsletters
+    from plexpy import newsletter_handler
+    from plexpy import notification_handler
+    from plexpy import notifiers
+    from plexpy import plextv
+    from plexpy import users
+    from plexpy import versioncheck
+    from plexpy import web_socket
+    from plexpy import webstart
+    from plexpy import config
 
 
 PROG_DIR = None

plexpy/activity_handler.py

@@ -26,12 +26,20 @@ from apscheduler.triggers.date import DateTrigger
 import pytz
 
 import plexpy
-from plexpy import activity_processor
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import datafactory
+    import activity_processor
-from plexpy import helpers
+    import datafactory
-from plexpy import logger
+    import helpers
-from plexpy import notification_handler
+    import logger
-from plexpy import pmsconnect
+    import notification_handler
+    import pmsconnect
+else:
+    from plexpy import activity_processor
+    from plexpy import datafactory
+    from plexpy import helpers
+    from plexpy import logger
+    from plexpy import notification_handler
+    from plexpy import pmsconnect
 
 
 ACTIVITY_SCHED = None

plexpy/activity_pinger.py

@@ -21,16 +21,28 @@ import threading
 import time
 
 import plexpy
-from plexpy import activity_handler
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import activity_processor
+    import activity_handler
-from plexpy import database
+    import activity_processor
-from plexpy import helpers
+    import database
-from plexpy import libraries
+    import helpers
-from plexpy import logger
+    import libraries
-from plexpy import notification_handler
+    import logger
-from plexpy import plextv
+    import notification_handler
-from plexpy import pmsconnect
+    import plextv
-from plexpy import web_socket
+    import pmsconnect
+    import web_socket
+else:
+    from plexpy import activity_handler
+    from plexpy import activity_processor
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import libraries
+    from plexpy import logger
+    from plexpy import notification_handler
+    from plexpy import plextv
+    from plexpy import pmsconnect
+    from plexpy import web_socket
 
 
 monitor_lock = threading.Lock()

plexpy/activity_processor.py

@@ -23,12 +23,20 @@ import json
 import time
 
 import plexpy
-from plexpy import database
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import helpers
+    import database
-from plexpy import libraries
+    import helpers
-from plexpy import logger
+    import libraries
-from plexpy import pmsconnect
+    import logger
-from plexpy import users
+    import pmsconnect
+    import users
+else:
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import libraries
+    from plexpy import logger
+    from plexpy import pmsconnect
+    from plexpy import users
 
 
 class ActivityProcessor(object):

plexpy/api2.py

@@ -34,17 +34,30 @@ import cherrypy
 import xmltodict
 
 import plexpy
-from plexpy import config
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import database
+    import config
-from plexpy import helpers
+    import database
-from plexpy import libraries
+    import helpers
-from plexpy import logger
+    import libraries
-from plexpy import mobile_app
+    import logger
-from plexpy import notification_handler
+    import mobile_app
-from plexpy import notifiers
+    import notification_handler
-from plexpy import newsletter_handler
+    import notifiers
-from plexpy import newsletters
+    import newsletter_handler
-from plexpy import users
+    import newsletters
+    import users
+else:
+    from plexpy import config
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import libraries
+    from plexpy import logger
+    from plexpy import mobile_app
+    from plexpy import notification_handler
+    from plexpy import notifiers
+    from plexpy import newsletter_handler
+    from plexpy import newsletters
+    from plexpy import users
 
 
 class API2(object):

plexpy/classes.py

@@ -25,12 +25,16 @@ from __future__ import unicode_literals
 from future import standard_library
 standard_library.install_aliases()
 
-import urllib.request, urllib.parse, urllib.error
+from urllib.request import FancyURLopener
 
-from plexpy.common import USER_AGENT
+import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    from common import USER_AGENT
+else:
+    from plexpy.common import USER_AGENT
 
 
-class PlexPyURLopener(urllib.request.FancyURLopener):
+class PlexPyURLopener(FancyURLopener):
     version = USER_AGENT
 
 
@@ -51,7 +55,7 @@ class AuthURLOpener(PlexPyURLopener):
         self.numTries = 0
 
         # call the base class
-        urllib.request.FancyURLopener.__init__(self)
+        FancyURLopener.__init__(self)
 
     def prompt_user_passwd(self, host, realm):
         """

plexpy/common.py

@@ -22,7 +22,11 @@ import distro
 import platform
 from collections import OrderedDict
 
-from plexpy import version
+import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import version
+else:
+    from plexpy import version
 
 
 # Identify Our Application

plexpy/config.py

@@ -27,7 +27,10 @@ import time
 from configobj import ConfigObj
 
 import plexpy
-from plexpy import logger
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+else:
+    from plexpy import logger
 
 
 def bool_int(value):

plexpy/database.py

@@ -25,7 +25,10 @@ import threading
 import time
 
 import plexpy
-from plexpy import logger
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+else:
+    from plexpy import logger
 
 
 FILENAME = "tautulli.db"

plexpy/datafactory.py

@@ -27,13 +27,22 @@ import json
 from itertools import groupby
 
 import plexpy
-from plexpy import common
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import database
+    import common
-from plexpy import datatables
+    import database
-from plexpy import helpers
+    import datatables
-from plexpy import logger
+    import helpers
-from plexpy import pmsconnect
+    import logger
-from plexpy import session
+    import pmsconnect
+    import session
+else:
+    from plexpy import common
+    from plexpy import database
+    from plexpy import datatables
+    from plexpy import helpers
+    from plexpy import logger
+    from plexpy import pmsconnect
+    from plexpy import session
 
 
 class DataFactory(object):

plexpy/datatables.py

@@ -19,9 +19,15 @@ from builtins import object
 
 import re
 
-from plexpy import database
+import plexpy
-from plexpy import helpers
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import logger
+    import database
+    import helpers
+    import logger
+else:
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import logger
 
 
 class DataTables(object):

plexpy/exceptions.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 #  This file is part of Tautulli.
 #
 #  Tautulli is free software: you can redistribute it and/or modify
@@ -14,6 +13,8 @@ from __future__ import unicode_literals
 #  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 unicode_literals
+
 
 class PlexPyException(Exception):
     """

plexpy/graphs.py

@@ -24,11 +24,18 @@ from builtins import object
 import datetime
 
 import plexpy
-from plexpy import common
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import database
+    import common
-from plexpy import logger
+    import database
-from plexpy import libraries
+    import logger
-from plexpy import session
+    import libraries
+    import session
+else:
+    from plexpy import common
+    from plexpy import database
+    from plexpy import logger
+    from plexpy import libraries
+    from plexpy import session
 
 
 class Graphs(object):

plexpy/helpers.py

@@ -63,9 +63,14 @@ from xml.dom import minidom
 import xmltodict
 
 import plexpy
-from plexpy import logger
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import request
+    import logger
-from plexpy.api2 import API2
+    import request
+    from api2 import API2
+else:
+    from plexpy import logger
+    from plexpy import request
+    from plexpy.api2 import API2
 
 
 def addtoapi(*dargs, **dkwargs):

plexpy/http_handler.py

@@ -30,8 +30,12 @@ import certifi
 import urllib3
 
 import plexpy
-from plexpy import helpers
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import logger
+    import helpers
+    import logger
+else:
+    from plexpy import helpers
+    from plexpy import logger
 
 
 class HTTPHandler(object):

plexpy/libraries.py

@@ -25,14 +25,24 @@ import json
 import os
 
 import plexpy
-from plexpy import common
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import database
+    import common
-from plexpy import datatables
+    import database
-from plexpy import helpers
+    import datatables
-from plexpy import logger
+    import helpers
-from plexpy import plextv
+    import logger
-from plexpy import pmsconnect
+    import plextv
-from plexpy import session
+    import pmsconnect
+    import session
+else:
+    from plexpy import common
+    from plexpy import database
+    from plexpy import datatables
+    from plexpy import helpers
+    from plexpy import logger
+    from plexpy import plextv
+    from plexpy import pmsconnect
+    from plexpy import session
 
 
 def refresh_libraries():

plexpy/lock.py

@@ -23,7 +23,11 @@ import queue
 import time
 import threading
 
-from plexpy import logger
+import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+else:
+    from plexpy import logger
 
 
 class TimedLock(object):

plexpy/log_reader.py

@@ -17,13 +17,17 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from builtins import str
+from io import open
 
 import os
 
 import plexpy
-from plexpy import helpers
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import logger
+    import helpers
+    import logger
+else:
+    from plexpy import helpers
+    from plexpy import logger
 
 
 def get_log_tail(window=20, parsed=True, log_type="server"):

plexpy/logger.py

@@ -34,8 +34,12 @@ import threading
 import traceback
 
 import plexpy
-from plexpy.helpers import is_public_ip
+if plexpy.PYTHON_VERSION < 3:
-from plexpy.config import _BLACKLIST_KEYS, _WHITELIST_KEYS
+    from helpers import is_public_ip
+    from config import _BLACKLIST_KEYS, _WHITELIST_KEYS
+else:
+    from plexpy.helpers import is_public_ip
+    from plexpy.config import _BLACKLIST_KEYS, _WHITELIST_KEYS
 
 
 # These settings are for file logging only

plexpy/mobile_app.py

@@ -21,8 +21,13 @@ from builtins import str
 
 import time
 
-from plexpy import database
+import plexpy
-from plexpy import logger
+if plexpy.PYTHON_VERSION < 3:
+    import database
+    import logger
+else:
+    from plexpy import database
+    from plexpy import logger
 
 
 TEMP_DEVICE_TOKEN = None

plexpy/newsletter_handler.py

@@ -25,9 +25,14 @@ from apscheduler.triggers.cron import CronTrigger
 import email.utils
 
 import plexpy
-from plexpy import database
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import logger
+    import database
-from plexpy import newsletters
+    import logger
+    import newsletters
+else:
+    from plexpy import database
+    from plexpy import logger
+    from plexpy import newsletters
 
 
 NEWSLETTER_SCHED = None

plexpy/newsletters.py

@@ -31,14 +31,24 @@ import os
 import re
 
 import plexpy
-from plexpy import common
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import database
+    import common
-from plexpy import helpers
+    import database
-from plexpy import libraries
+    import helpers
-from plexpy import logger
+    import libraries
-from plexpy import newsletter_handler
+    import logger
-from plexpy import pmsconnect
+    import newsletter_handler
-from plexpy.notifiers import send_notification, EMAIL
+    import pmsconnect
+    from notifiers import send_notification, EMAIL
+else:
+    from plexpy import common
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import libraries
+    from plexpy import logger
+    from plexpy import newsletter_handler
+    from plexpy import pmsconnect
+    from plexpy.notifiers import send_notification, EMAIL
 
 
 AGENT_IDS = {

plexpy/notification_handler.py

@@ -45,16 +45,28 @@ import time
 import musicbrainzngs
 
 import plexpy
-from plexpy import activity_processor
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import common
+    import activity_processor
-from plexpy import database
+    import common
-from plexpy import datafactory
+    import database
-from plexpy import logger
+    import datafactory
-from plexpy import helpers
+    import logger
-from plexpy import notifiers
+    import helpers
-from plexpy import pmsconnect
+    import notifiers
-from plexpy import request
+    import pmsconnect
-from plexpy.newsletter_handler import notify as notify_newsletter
+    import request
+    from newsletter_handler import notify as notify_newsletter
+else:
+    from plexpy import activity_processor
+    from plexpy import common
+    from plexpy import database
+    from plexpy import datafactory
+    from plexpy import logger
+    from plexpy import helpers
+    from plexpy import notifiers
+    from plexpy import pmsconnect
+    from plexpy import request
+    from plexpy.newsletter_handler import notify as notify_newsletter
 
 
 def process_queue():

plexpy/notifiers.py

@@ -62,14 +62,24 @@ import facebook
 import twitter
 
 import plexpy
-from plexpy import common
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import database
+    import common
-from plexpy import helpers
+    import database
-from plexpy import logger
+    import helpers
-from plexpy import mobile_app
+    import logger
-from plexpy import pmsconnect
+    import mobile_app
-from plexpy import request
+    import pmsconnect
-from plexpy import users
+    import request
+    import users
+else:
+    from plexpy import common
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import logger
+    from plexpy import mobile_app
+    from plexpy import pmsconnect
+    from plexpy import request
+    from plexpy import users
 
 
 BROWSER_NOTIFIERS = {}

plexpy/plexivity_import.py

@@ -24,12 +24,20 @@ import sqlite3
 from xml.dom import minidom
 
 import plexpy
-from plexpy import activity_pinger
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import activity_processor
+    import activity_pinger
-from plexpy import database
+    import activity_processor
-from plexpy import helpers
+    import database
-from plexpy import logger
+    import helpers
-from plexpy import users
+    import logger
+    import users
+else:
+    from plexpy import activity_pinger
+    from plexpy import activity_processor
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import logger
+    from plexpy import users
 
 
 def extract_plexivity_xml(xml=None):

plexpy/plextv.py

@@ -25,13 +25,22 @@ import base64
 import json
 
 import plexpy
-from plexpy import common
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import helpers
+    import common
-from plexpy import http_handler
+    import helpers
-from plexpy import logger
+    import http_handler
-from plexpy import users
+    import logger
-from plexpy import pmsconnect
+    import users
-from plexpy import session
+    import pmsconnect
+    import session
+else:
+    from plexpy import common
+    from plexpy import helpers
+    from plexpy import http_handler
+    from plexpy import logger
+    from plexpy import users
+    from plexpy import pmsconnect
+    from plexpy import session
 
 
 def get_server_resources(return_presence=False, return_server=False, **kwargs):

plexpy/plexwatch_import.py

@@ -23,12 +23,20 @@ import sqlite3
 from xml.dom import minidom
 
 import plexpy
-from plexpy import activity_pinger
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import activity_processor
+    import activity_pinger
-from plexpy import database
+    import activity_processor
-from plexpy import helpers
+    import database
-from plexpy import logger
+    import helpers
-from plexpy import users
+    import logger
+    import users
+else:
+    from plexpy import activity_pinger
+    from plexpy import activity_processor
+    from plexpy import database
+    from plexpy import helpers
+    from plexpy import logger
+    from plexpy import users
 
 
 def extract_plexwatch_xml(xml=None):

plexpy/pmsconnect.py

@@ -29,14 +29,24 @@ import time
 from urllib.parse import quote, quote_plus, urlencode
 
 import plexpy
-from plexpy import activity_processor
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import common
+    import activity_processor
-from plexpy import helpers
+    import common
-from plexpy import http_handler
+    import helpers
-from plexpy import logger
+    import http_handler
-from plexpy import plextv
+    import logger
-from plexpy import session
+    import plextv
-from plexpy import users
+    import session
+    import users
+else:
+    from plexpy import activity_processor
+    from plexpy import common
+    from plexpy import helpers
+    from plexpy import http_handler
+    from plexpy import logger
+    from plexpy import plextv
+    from plexpy import session
+    from plexpy import users
 
 
 def get_server_friendly_name():

plexpy/request.py

@@ -27,8 +27,12 @@ import collections
 import requests
 
 import plexpy
-from plexpy import lock
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import logger
+    import lock
+    import logger
+else:
+    from plexpy import lock
+    from plexpy import logger
 
 
 # Dictionary with last request times, for rate limiting.

plexpy/session.py

@@ -21,8 +21,13 @@ from builtins import str
 
 import cherrypy
 
-from plexpy import common
+import plexpy
-from plexpy import users
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import users
+else:
+    from plexpy import common
+    from plexpy import users
 
 
 def get_session_info():

plexpy/users.py

@@ -27,14 +27,24 @@ import httpagentparser
 import time
 
 import plexpy
-from plexpy import common
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import database
+    import common
-from plexpy import datatables
+    import database
-from plexpy import helpers
+    import datatables
-from plexpy import libraries
+    import helpers
-from plexpy import logger
+    import libraries
-from plexpy import plextv
+    import logger
-from plexpy import session
+    import plextv
+    import session
+else:
+    from plexpy import common
+    from plexpy import database
+    from plexpy import datatables
+    from plexpy import helpers
+    from plexpy import libraries
+    from plexpy import logger
+    from plexpy import plextv
+    from plexpy import session
 
 
 def refresh_users():

plexpy/versioncheck.py

@@ -29,9 +29,14 @@ import subprocess
 import tarfile
 
 import plexpy
-from plexpy import common
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import logger
+    import common
-from plexpy import request
+    import logger
+    import request
+else:
+    from plexpy import common
+    from plexpy import logger
+    from plexpy import request
 
 
 def runGit(args):

plexpy/web_socket.py

@@ -30,11 +30,18 @@ import time
 import websocket
 
 import plexpy
-from plexpy import activity_handler
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import activity_pinger
+    import activity_handler
-from plexpy import activity_processor
+    import activity_pinger
-from plexpy import database
+    import activity_processor
-from plexpy import logger
+    import database
+    import logger
+else:
+    from plexpy import activity_handler
+    from plexpy import activity_pinger
+    from plexpy import activity_processor
+    from plexpy import database
+    from plexpy import logger
 
 
 name = 'websocket'

plexpy/webauth.py

@@ -35,10 +35,16 @@ from hashing_passwords import check_hash
 import jwt
 
 import plexpy
-from plexpy import logger
+if plexpy.PYTHON_VERSION < 3:
-from plexpy.database import MonitorDatabase
+    import logger
-from plexpy.users import Users, refresh_users
+    from database import MonitorDatabase
-from plexpy.plextv import PlexTV
+    from users import Users, refresh_users
+    from plextv import PlexTV
+else:
+    from plexpy import logger
+    from plexpy.database import MonitorDatabase
+    from plexpy.users import Users, refresh_users
+    from plexpy.plextv import PlexTV
 
 
 JWT_ALGORITHM = 'HS256'

plexpy/webserve.py

@@ -41,34 +41,64 @@ from mako import exceptions
 import websocket
 
 import plexpy
-from plexpy import activity_pinger
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import common
+    import activity_pinger
-from plexpy import config
+    import common
-from plexpy import database
+    import config
-from plexpy import datafactory
+    import database
-from plexpy import graphs
+    import datafactory
-from plexpy import helpers
+    import graphs
-from plexpy import http_handler
+    import helpers
-from plexpy import libraries
+    import http_handler
-from plexpy import log_reader
+    import libraries
-from plexpy import logger
+    import log_reader
-from plexpy import newsletter_handler
+    import logger
-from plexpy import newsletters
+    import newsletter_handler
-from plexpy import mobile_app
+    import newsletters
-from plexpy import notification_handler
+    import mobile_app
-from plexpy import notifiers
+    import notification_handler
-from plexpy import plextv
+    import notifiers
-from plexpy import plexivity_import
+    import plextv
-from plexpy import plexwatch_import
+    import plexivity_import
-from plexpy import pmsconnect
+    import plexwatch_import
-from plexpy import users
+    import pmsconnect
-from plexpy import versioncheck
+    import users
-from plexpy import web_socket
+    import versioncheck
-from plexpy import webstart
+    import web_socket
-from plexpy.api2 import API2
+    import webstart
-from plexpy.helpers import checked, addtoapi, get_ip, create_https_certificates, build_datatables_json, sanitize_out
+    from api2 import API2
-from plexpy.session import get_session_info, get_session_user_id, allow_session_user, allow_session_library
+    from helpers import checked, addtoapi, get_ip, create_https_certificates, build_datatables_json, sanitize_out
-from plexpy.webauth import AuthController, requireAuth, member_of, check_auth
+    from session import get_session_info, get_session_user_id, allow_session_user, allow_session_library
+    from webauth import AuthController, requireAuth, member_of, check_auth
+else:
+    from plexpy import activity_pinger
+    from plexpy import common
+    from plexpy import config
+    from plexpy import database
+    from plexpy import datafactory
+    from plexpy import graphs
+    from plexpy import helpers
+    from plexpy import http_handler
+    from plexpy import libraries
+    from plexpy import log_reader
+    from plexpy import logger
+    from plexpy import newsletter_handler
+    from plexpy import newsletters
+    from plexpy import mobile_app
+    from plexpy import notification_handler
+    from plexpy import notifiers
+    from plexpy import plextv
+    from plexpy import plexivity_import
+    from plexpy import plexwatch_import
+    from plexpy import pmsconnect
+    from plexpy import users
+    from plexpy import versioncheck
+    from plexpy import web_socket
+    from plexpy import webstart
+    from plexpy.api2 import API2
+    from plexpy.helpers import checked, addtoapi, get_ip, create_https_certificates, build_datatables_json, sanitize_out
+    from plexpy.session import get_session_info, get_session_user_id, allow_session_user, allow_session_library
+    from plexpy.webauth import AuthController, requireAuth, member_of, check_auth
 
 
 def serve_template(templatename, **kwargs):

plexpy/webstart.py

@@ -29,10 +29,16 @@ from urllib.parse import urlencode
 import cherrypy
 
 import plexpy
-from plexpy import logger
+if plexpy.PYTHON_VERSION < 3:
-from plexpy import webauth
+    import logger
-from plexpy.helpers import create_https_certificates
+    import webauth
-from plexpy.webserve import WebInterface
+    from helpers import create_https_certificates
+    from webserve import WebInterface
+else:
+    from plexpy import logger
+    from plexpy import webauth
+    from plexpy.helpers import create_https_certificates
+    from plexpy.webserve import WebInterface
 
 
 def start():