Fix imports for Python 2

plexpy/__init__.py

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

plexpy/activity_handler.py

@@ -26,6 +26,14 @@ from apscheduler.triggers.date import DateTrigger
 import pytz
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import activity_processor
+    import datafactory
+    import helpers
+    import logger
+    import notification_handler
+    import pmsconnect
+else:
     from plexpy import activity_processor
     from plexpy import datafactory
     from plexpy import helpers

plexpy/activity_pinger.py

@@ -21,6 +21,18 @@ import threading
 import time
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import activity_handler
+    import activity_processor
+    import database
+    import helpers
+    import libraries
+    import logger
+    import notification_handler
+    import plextv
+    import pmsconnect
+    import web_socket
+else:
     from plexpy import activity_handler
     from plexpy import activity_processor
     from plexpy import database

plexpy/activity_processor.py

@@ -23,6 +23,14 @@ import json
 import time
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import database
+    import helpers
+    import libraries
+    import logger
+    import pmsconnect
+    import users
+else:
     from plexpy import database
     from plexpy import helpers
     from plexpy import libraries

plexpy/api2.py

@@ -34,6 +34,19 @@ import cherrypy
 import xmltodict
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import config
+    import database
+    import helpers
+    import libraries
+    import logger
+    import mobile_app
+    import notification_handler
+    import notifiers
+    import newsletter_handler
+    import newsletters
+    import users
+else:
     from plexpy import config
     from plexpy import database
     from plexpy import helpers

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
 
+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,6 +22,10 @@ import distro
 import platform
 from collections import OrderedDict
 
+import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import version
+else:
     from plexpy import version
 
 

plexpy/config.py

@@ -27,6 +27,9 @@ import time
 from configobj import ConfigObj
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+else:
     from plexpy import logger
 
 

plexpy/database.py

@@ -25,6 +25,9 @@ import threading
 import time
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+else:
     from plexpy import logger
 
 

plexpy/datafactory.py

@@ -27,6 +27,15 @@ import json
 from itertools import groupby
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import database
+    import datatables
+    import helpers
+    import logger
+    import pmsconnect
+    import session
+else:
     from plexpy import common
     from plexpy import database
     from plexpy import datatables

plexpy/datatables.py

@@ -19,6 +19,12 @@ from builtins import object
 
 import re
 
+import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import database
+    import helpers
+    import logger
+else:
     from plexpy import database
     from plexpy import helpers
     from plexpy import logger

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,6 +24,13 @@ from builtins import object
 import datetime
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import database
+    import logger
+    import libraries
+    import session
+else:
     from plexpy import common
     from plexpy import database
     from plexpy import logger

plexpy/helpers.py

@@ -63,6 +63,11 @@ from xml.dom import minidom
 import xmltodict
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+    import request
+    from api2 import API2
+else:
     from plexpy import logger
     from plexpy import request
     from plexpy.api2 import API2

plexpy/http_handler.py

@@ -30,6 +30,10 @@ import certifi
 import urllib3
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import helpers
+    import logger
+else:
     from plexpy import helpers
     from plexpy import logger
 

plexpy/libraries.py

@@ -25,6 +25,16 @@ import json
 import os
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import database
+    import datatables
+    import helpers
+    import logger
+    import plextv
+    import pmsconnect
+    import session
+else:
     from plexpy import common
     from plexpy import database
     from plexpy import datatables

plexpy/lock.py

@@ -23,6 +23,10 @@ import queue
 import time
 import threading
 
+import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+else:
     from plexpy import logger
 
 

plexpy/log_reader.py

@@ -17,11 +17,15 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from builtins import str
+from io import open
 
 import os
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import helpers
+    import logger
+else:
     from plexpy import helpers
     from plexpy import logger
 

plexpy/logger.py

@@ -34,6 +34,10 @@ import threading
 import traceback
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    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
 

plexpy/mobile_app.py

@@ -21,6 +21,11 @@ from builtins import str
 
 import time
 
+import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import database
+    import logger
+else:
     from plexpy import database
     from plexpy import logger
 

plexpy/newsletter_handler.py

@@ -25,6 +25,11 @@ from apscheduler.triggers.cron import CronTrigger
 import email.utils
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import database
+    import logger
+    import newsletters
+else:
     from plexpy import database
     from plexpy import logger
     from plexpy import newsletters

plexpy/newsletters.py

@@ -31,6 +31,16 @@ import os
 import re
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import database
+    import helpers
+    import libraries
+    import logger
+    import newsletter_handler
+    import pmsconnect
+    from notifiers import send_notification, EMAIL
+else:
     from plexpy import common
     from plexpy import database
     from plexpy import helpers

plexpy/notification_handler.py

@@ -45,6 +45,18 @@ import time
 import musicbrainzngs
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import activity_processor
+    import common
+    import database
+    import datafactory
+    import logger
+    import helpers
+    import notifiers
+    import pmsconnect
+    import request
+    from newsletter_handler import notify as notify_newsletter
+else:
     from plexpy import activity_processor
     from plexpy import common
     from plexpy import database

plexpy/notifiers.py

@@ -62,6 +62,16 @@ import facebook
 import twitter
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import database
+    import helpers
+    import logger
+    import mobile_app
+    import pmsconnect
+    import request
+    import users
+else:
     from plexpy import common
     from plexpy import database
     from plexpy import helpers

plexpy/plexivity_import.py

@@ -24,6 +24,14 @@ import sqlite3
 from xml.dom import minidom
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import activity_pinger
+    import activity_processor
+    import database
+    import helpers
+    import logger
+    import users
+else:
     from plexpy import activity_pinger
     from plexpy import activity_processor
     from plexpy import database

plexpy/plextv.py

@@ -25,6 +25,15 @@ import base64
 import json
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import helpers
+    import http_handler
+    import logger
+    import users
+    import pmsconnect
+    import session
+else:
     from plexpy import common
     from plexpy import helpers
     from plexpy import http_handler

plexpy/plexwatch_import.py

@@ -23,6 +23,14 @@ import sqlite3
 from xml.dom import minidom
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import activity_pinger
+    import activity_processor
+    import database
+    import helpers
+    import logger
+    import users
+else:
     from plexpy import activity_pinger
     from plexpy import activity_processor
     from plexpy import database

plexpy/pmsconnect.py

@@ -29,6 +29,16 @@ import time
 from urllib.parse import quote, quote_plus, urlencode
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import activity_processor
+    import common
+    import helpers
+    import http_handler
+    import logger
+    import plextv
+    import session
+    import users
+else:
     from plexpy import activity_processor
     from plexpy import common
     from plexpy import helpers

plexpy/request.py

@@ -27,6 +27,10 @@ import collections
 import requests
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import lock
+    import logger
+else:
     from plexpy import lock
     from plexpy import logger
 

plexpy/session.py

@@ -21,6 +21,11 @@ from builtins import str
 
 import cherrypy
 
+import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import users
+else:
     from plexpy import common
     from plexpy import users
 

plexpy/users.py

@@ -27,6 +27,16 @@ import httpagentparser
 import time
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import database
+    import datatables
+    import helpers
+    import libraries
+    import logger
+    import plextv
+    import session
+else:
     from plexpy import common
     from plexpy import database
     from plexpy import datatables

plexpy/versioncheck.py

@@ -29,6 +29,11 @@ import subprocess
 import tarfile
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import common
+    import logger
+    import request
+else:
     from plexpy import common
     from plexpy import logger
     from plexpy import request

plexpy/web_socket.py

@@ -30,6 +30,13 @@ import time
 import websocket
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import activity_handler
+    import activity_pinger
+    import activity_processor
+    import database
+    import logger
+else:
     from plexpy import activity_handler
     from plexpy import activity_pinger
     from plexpy import activity_processor

plexpy/webauth.py

@@ -35,6 +35,12 @@ from hashing_passwords import check_hash
 import jwt
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+    from database import MonitorDatabase
+    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

plexpy/webserve.py

@@ -41,6 +41,36 @@ from mako import exceptions
 import websocket
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import activity_pinger
+    import common
+    import config
+    import database
+    import datafactory
+    import graphs
+    import helpers
+    import http_handler
+    import libraries
+    import log_reader
+    import logger
+    import newsletter_handler
+    import newsletters
+    import mobile_app
+    import notification_handler
+    import notifiers
+    import plextv
+    import plexivity_import
+    import plexwatch_import
+    import pmsconnect
+    import users
+    import versioncheck
+    import web_socket
+    import webstart
+    from api2 import API2
+    from helpers import checked, addtoapi, get_ip, create_https_certificates, build_datatables_json, sanitize_out
+    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

plexpy/webstart.py

@@ -29,6 +29,12 @@ from urllib.parse import urlencode
 import cherrypy
 
 import plexpy
+if plexpy.PYTHON_VERSION < 3:
+    import logger
+    import webauth
+    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