Fix imports for Python 2

This commit is contained in:
JonnyWong16 2020-03-23 20:21:30 -07:00
parent 2ce5194156
commit 078685a2a3
36 changed files with 488 additions and 207 deletions

View file

@ -40,24 +40,46 @@ from apscheduler.triggers.interval import IntervalTrigger
from UniversalAnalytics import Tracker
import pytz
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
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
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

View file

@ -26,12 +26,20 @@ from apscheduler.triggers.date import DateTrigger
import pytz
import plexpy
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
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
from plexpy import logger
from plexpy import notification_handler
from plexpy import pmsconnect
ACTIVITY_SCHED = None

View file

@ -21,16 +21,28 @@ import threading
import time
import plexpy
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
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
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()

View file

@ -23,12 +23,20 @@ import json
import time
import plexpy
from plexpy import database
from plexpy import helpers
from plexpy import libraries
from plexpy import logger
from plexpy import pmsconnect
from plexpy import users
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
from plexpy import logger
from plexpy import pmsconnect
from plexpy import users
class ActivityProcessor(object):

View file

@ -34,17 +34,30 @@ import cherrypy
import xmltodict
import plexpy
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
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
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):

View file

@ -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):
"""

View file

@ -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

View file

@ -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):

View file

@ -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"

View file

@ -27,13 +27,22 @@ import json
from itertools import groupby
import plexpy
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
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
from plexpy import helpers
from plexpy import logger
from plexpy import pmsconnect
from plexpy import session
class DataFactory(object):

View file

@ -19,9 +19,15 @@ from builtins import object
import re
from plexpy import database
from plexpy import helpers
from plexpy import logger
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
class DataTables(object):

View file

@ -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):
"""

View file

@ -24,11 +24,18 @@ from builtins import object
import datetime
import plexpy
from plexpy import common
from plexpy import database
from plexpy import logger
from plexpy import libraries
from plexpy import session
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
from plexpy import libraries
from plexpy import session
class Graphs(object):

View file

@ -63,9 +63,14 @@ from xml.dom import minidom
import xmltodict
import plexpy
from plexpy import logger
from plexpy import request
from plexpy.api2 import API2
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
def addtoapi(*dargs, **dkwargs):

View file

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

View file

@ -25,14 +25,24 @@ import json
import os
import plexpy
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
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
from plexpy import helpers
from plexpy import logger
from plexpy import plextv
from plexpy import pmsconnect
from plexpy import session
def refresh_libraries():

View file

@ -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):

View file

@ -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
from plexpy import logger
if plexpy.PYTHON_VERSION < 3:
import helpers
import logger
else:
from plexpy import helpers
from plexpy import logger
def get_log_tail(window=20, parsed=True, log_type="server"):

View file

@ -34,8 +34,12 @@ import threading
import traceback
import plexpy
from plexpy.helpers import is_public_ip
from plexpy.config import _BLACKLIST_KEYS, _WHITELIST_KEYS
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
# These settings are for file logging only

View file

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

View file

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

View file

@ -31,14 +31,24 @@ import os
import re
import plexpy
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
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
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 = {

View file

@ -45,16 +45,28 @@ import time
import musicbrainzngs
import plexpy
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
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
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():

View file

@ -62,14 +62,24 @@ import facebook
import twitter
import plexpy
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
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
from plexpy import logger
from plexpy import mobile_app
from plexpy import pmsconnect
from plexpy import request
from plexpy import users
BROWSER_NOTIFIERS = {}

View file

@ -24,12 +24,20 @@ import sqlite3
from xml.dom import minidom
import plexpy
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
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
from plexpy import helpers
from plexpy import logger
from plexpy import users
def extract_plexivity_xml(xml=None):

View file

@ -25,13 +25,22 @@ import base64
import json
import plexpy
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
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
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):

View file

@ -23,12 +23,20 @@ import sqlite3
from xml.dom import minidom
import plexpy
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
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
from plexpy import helpers
from plexpy import logger
from plexpy import users
def extract_plexwatch_xml(xml=None):

View file

@ -29,14 +29,24 @@ import time
from urllib.parse import quote, quote_plus, urlencode
import plexpy
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
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
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():

View file

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

View file

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

View file

@ -27,14 +27,24 @@ import httpagentparser
import time
import plexpy
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
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
from plexpy import helpers
from plexpy import libraries
from plexpy import logger
from plexpy import plextv
from plexpy import session
def refresh_users():

View file

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

View file

@ -30,11 +30,18 @@ import time
import websocket
import plexpy
from plexpy import activity_handler
from plexpy import activity_pinger
from plexpy import activity_processor
from plexpy import database
from plexpy import logger
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
from plexpy import database
from plexpy import logger
name = 'websocket'

View file

@ -35,10 +35,16 @@ from hashing_passwords import check_hash
import jwt
import plexpy
from plexpy import logger
from plexpy.database import MonitorDatabase
from plexpy.users import Users, refresh_users
from plexpy.plextv import PlexTV
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
from plexpy.plextv import PlexTV
JWT_ALGORITHM = 'HS256'

View file

@ -41,34 +41,64 @@ from mako import exceptions
import websocket
import plexpy
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
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
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):

View file

@ -29,10 +29,16 @@ from urllib.parse import urlencode
import cherrypy
import plexpy
from plexpy import logger
from plexpy import webauth
from plexpy.helpers import create_https_certificates
from plexpy.webserve import WebInterface
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
from plexpy.webserve import WebInterface
def start():