From 82c09570c48c5521e89112ee1c5244ab75e52f4a Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Mon, 23 Mar 2020 22:03:17 -0700 Subject: [PATCH] Update all future imports for Python 2 --- Tautulli.py | 2 +- plexpy/__init__.py | 6 ++---- plexpy/activity_handler.py | 4 ++-- plexpy/activity_pinger.py | 2 +- plexpy/activity_processor.py | 4 ++-- plexpy/api2.py | 4 ++-- plexpy/classes.py | 4 +--- plexpy/config.py | 8 ++++---- plexpy/database.py | 2 +- plexpy/datafactory.py | 6 +++--- plexpy/datatables.py | 2 +- plexpy/graphs.py | 6 +++--- plexpy/helpers.py | 17 ++++++++--------- plexpy/http_handler.py | 11 ++++------- plexpy/libraries.py | 6 +++--- plexpy/lock.py | 4 ++-- plexpy/logger.py | 2 +- plexpy/mobile_app.py | 2 +- plexpy/newsletters.py | 6 +++--- plexpy/notification_handler.py | 10 ++++------ plexpy/notifiers.py | 12 +++++------- plexpy/plexivity_import.py | 2 +- plexpy/plextv.py | 6 +++--- plexpy/plexwatch_import.py | 2 +- plexpy/pmsconnect.py | 10 ++++------ plexpy/request.py | 2 +- plexpy/session.py | 2 +- plexpy/users.py | 8 +++----- plexpy/versioncheck.py | 4 ++-- plexpy/web_socket.py | 4 +--- plexpy/webauth.py | 8 +++----- plexpy/webserve.py | 15 ++++++--------- plexpy/webstart.py | 7 ++----- 33 files changed, 82 insertions(+), 108 deletions(-) diff --git a/Tautulli.py b/Tautulli.py index 36af255a..a402a296 100755 --- a/Tautulli.py +++ b/Tautulli.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Tautulli. If not, see . -from builtins import str +from future.builtins import str import os import sys diff --git a/plexpy/__init__.py b/plexpy/__init__.py index 9728ccb8..20aa27c9 100644 --- a/plexpy/__init__.py +++ b/plexpy/__init__.py @@ -15,13 +15,11 @@ from __future__ import absolute_import from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import range +from future.builtins import range import datetime import os -import queue +import future.moves.queue as queue import sqlite3 import sys import subprocess diff --git a/plexpy/activity_handler.py b/plexpy/activity_handler.py index b95fbe6a..36b3ef5b 100644 --- a/plexpy/activity_handler.py +++ b/plexpy/activity_handler.py @@ -15,8 +15,8 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import str -from builtins import object +from future.builtins import str +from future.builtins import object import datetime import os diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index 61eaa7e8..01ce43dc 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -15,7 +15,7 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import str +from future.builtins import str import threading import time diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py index 3cb69c2a..bd390733 100644 --- a/plexpy/activity_processor.py +++ b/plexpy/activity_processor.py @@ -15,8 +15,8 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import str -from builtins import object +from future.builtins import str +from future.builtins import object from collections import defaultdict import json diff --git a/plexpy/api2.py b/plexpy/api2.py index cfe55894..7c1b37b2 100644 --- a/plexpy/api2.py +++ b/plexpy/api2.py @@ -18,8 +18,8 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import str -from builtins import object +from future.builtins import str +from future.builtins import object import hashlib import inspect diff --git a/plexpy/classes.py b/plexpy/classes.py index 86b5d2ea..10fc024c 100644 --- a/plexpy/classes.py +++ b/plexpy/classes.py @@ -22,10 +22,8 @@ from __future__ import absolute_import from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from urllib.request import FancyURLopener +from future.moves.urllib.request import FancyURLopener import plexpy if plexpy.PYTHON_VERSION < 3: diff --git a/plexpy/config.py b/plexpy/config.py index d143e5d7..75050efe 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -15,8 +15,8 @@ from __future__ import absolute_import from __future__ import unicode_literals -from past.builtins import basestring -from builtins import object +from future.builtins import object +from future.builtins import str import arrow import os @@ -37,7 +37,7 @@ def bool_int(value): """ Casts a config value into a 0 or 1 """ - if isinstance(value, basestring): + if isinstance(value, str): if value.lower() in ('', '0', 'false', 'f', 'no', 'n', 'off'): value = 0 return int(bool(value)) @@ -704,7 +704,7 @@ class Config(object): for key, subkeys in self._config.items(): for subkey, value in subkeys.items(): - if isinstance(value, basestring) and len(value.strip()) > 5 and \ + if isinstance(value, str) and len(value.strip()) > 5 and \ subkey.upper() not in _WHITELIST_KEYS and any(bk in subkey.upper() for bk in _BLACKLIST_KEYS): blacklist.add(value.strip()) diff --git a/plexpy/database.py b/plexpy/database.py index 843a7eb4..a5455677 100644 --- a/plexpy/database.py +++ b/plexpy/database.py @@ -15,7 +15,7 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import object +from future.builtins import object import arrow import os diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index b9b9f5e5..de503a10 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -18,9 +18,9 @@ from __future__ import division from __future__ import absolute_import from __future__ import unicode_literals -from builtins import next -from builtins import str -from builtins import object +from future.builtins import next +from future.builtins import str +from future.builtins import object from past.utils import old_div import json diff --git a/plexpy/datatables.py b/plexpy/datatables.py index aed877a3..e5d0baca 100644 --- a/plexpy/datatables.py +++ b/plexpy/datatables.py @@ -15,7 +15,7 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import object +from future.builtins import object import re diff --git a/plexpy/graphs.py b/plexpy/graphs.py index 56244f84..a7dbfced 100644 --- a/plexpy/graphs.py +++ b/plexpy/graphs.py @@ -17,9 +17,9 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import str -from builtins import range -from builtins import object +from future.builtins import str +from future.builtins import range +from future.builtins import object import datetime diff --git a/plexpy/helpers.py b/plexpy/helpers.py index eab2edb4..86be8c1f 100644 --- a/plexpy/helpers.py +++ b/plexpy/helpers.py @@ -20,10 +20,9 @@ from __future__ import absolute_import from __future__ import unicode_literals from past.builtins import cmp from future import standard_library -standard_library.install_aliases() -from builtins import zip -from builtins import str -from past.builtins import basestring + +from future.builtins import zip +from future.builtins import str from past.utils import old_div import arrow @@ -39,7 +38,7 @@ import geoip2.database import geoip2.errors import hashlib import imghdr -from itertools import zip_longest +from future.moves.itertools import zip_longest import ipwhois import ipwhois.exceptions import ipwhois.utils @@ -57,7 +56,7 @@ import sys import tarfile import time import unicodedata -from urllib.parse import urlencode +from future.moves.urllib.parse import urlencode import urllib3 from xml.dom import minidom import xmltodict @@ -583,7 +582,7 @@ def sanitize_out(*dargs, **dkwargs): def sanitize(obj): - if isinstance(obj, basestring): + if isinstance(obj, str): return str(obj).replace('<', '<').replace('>', '>') elif isinstance(obj, list): return [sanitize(o) for o in obj] @@ -1259,7 +1258,7 @@ def traverse_map(obj, func): def split_args(args=None): if isinstance(args, list): return args - elif isinstance(args, basestring): + elif isinstance(args, str): return [arg.decode(plexpy.SYS_ENCODING, 'ignore') for arg in shlex.split(args.encode(plexpy.SYS_ENCODING, 'ignore'))] return [] @@ -1284,7 +1283,7 @@ def mask_config_passwords(config): def bool_true(value): if value is True or value == 1: return True - elif isinstance(value, basestring) and value.lower() in ('1', 'true', 't', 'yes', 'y', 'on'): + elif isinstance(value, str) and value.lower() in ('1', 'true', 't', 'yes', 'y', 'on'): return True return False diff --git a/plexpy/http_handler.py b/plexpy/http_handler.py index cec3a9e7..39cd4d02 100644 --- a/plexpy/http_handler.py +++ b/plexpy/http_handler.py @@ -17,15 +17,12 @@ from __future__ import absolute_import from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from past.builtins import basestring -from builtins import object -from builtins import str +from future.builtins import object +from future.builtins import str from functools import partial from multiprocessing.dummy import Pool as ThreadPool -from urllib.parse import urljoin +from future.moves.urllib.parse import urljoin import certifi import urllib3 @@ -47,7 +44,7 @@ class HTTPHandler(object): def __init__(self, urls, headers=None, token=None, timeout=10, ssl_verify=True, silent=False): self._silent = silent - if isinstance(urls, basestring): + if isinstance(urls, str): self.urls = urls.split() or urls.split(',') else: self.urls = urls diff --git a/plexpy/libraries.py b/plexpy/libraries.py index d5b52ed2..4c1460e1 100644 --- a/plexpy/libraries.py +++ b/plexpy/libraries.py @@ -17,9 +17,9 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import str -from builtins import next -from builtins import object +from future.builtins import str +from future.builtins import next +from future.builtins import object import json import os diff --git a/plexpy/lock.py b/plexpy/lock.py index aeaf473f..5cfbc0ed 100644 --- a/plexpy/lock.py +++ b/plexpy/lock.py @@ -17,9 +17,9 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import object +from future.builtins import object -import queue +import future.moves.queue as queue import time import threading diff --git a/plexpy/logger.py b/plexpy/logger.py index 40e76ca5..82405db2 100644 --- a/plexpy/logger.py +++ b/plexpy/logger.py @@ -17,7 +17,7 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import str +from future.builtins import str from past.builtins import basestring from logutils.queue import QueueHandler, QueueListener diff --git a/plexpy/mobile_app.py b/plexpy/mobile_app.py index 16828e30..a2571f9b 100644 --- a/plexpy/mobile_app.py +++ b/plexpy/mobile_app.py @@ -17,7 +17,7 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import str +from future.builtins import str import time diff --git a/plexpy/newsletters.py b/plexpy/newsletters.py index 23373ff1..9eb70d4d 100644 --- a/plexpy/newsletters.py +++ b/plexpy/newsletters.py @@ -17,9 +17,9 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import next -from builtins import str -from builtins import object +from future.builtins import next +from future.builtins import str +from future.builtins import object import arrow from collections import OrderedDict diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index e4db2ab7..d9a35535 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -19,12 +19,10 @@ from __future__ import division from __future__ import absolute_import from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import next -from builtins import map -from builtins import str -from builtins import range +from future.builtins import next +from future.builtins import map +from future.builtins import str +from future.builtins import range from past.builtins import basestring from past.utils import old_div diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py index 108666b0..08af7ea4 100644 --- a/plexpy/notifiers.py +++ b/plexpy/notifiers.py @@ -17,11 +17,9 @@ from __future__ import absolute_import from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import next -from builtins import str -from builtins import object +from future.builtins import next +from future.builtins import str +from future.builtins import object import base64 import bleach @@ -38,8 +36,8 @@ import subprocess import sys import threading import time -from urllib.parse import urlencode -from urllib.parse import urlparse +from future.moves.urllib.parse import urlencode +from future.moves.urllib.parse import urlparse try: from Cryptodome.Protocol.KDF import PBKDF2 diff --git a/plexpy/plexivity_import.py b/plexpy/plexivity_import.py index 47e9abd5..ce6c4bde 100644 --- a/plexpy/plexivity_import.py +++ b/plexpy/plexivity_import.py @@ -17,7 +17,7 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import str +from future.builtins import str import arrow import sqlite3 diff --git a/plexpy/plextv.py b/plexpy/plextv.py index 704d80eb..7b15e41c 100644 --- a/plexpy/plextv.py +++ b/plexpy/plextv.py @@ -17,9 +17,9 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import next -from builtins import str -from builtins import object +from future.builtins import next +from future.builtins import str +from future.builtins import object import base64 import json diff --git a/plexpy/plexwatch_import.py b/plexpy/plexwatch_import.py index 44101949..62204eef 100644 --- a/plexpy/plexwatch_import.py +++ b/plexpy/plexwatch_import.py @@ -17,7 +17,7 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import str +from future.builtins import str import sqlite3 from xml.dom import minidom diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 7c68fbb9..2fd9da3c 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -17,16 +17,14 @@ from __future__ import absolute_import from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import next -from builtins import str -from builtins import object +from future.builtins import next +from future.builtins import str +from future.builtins import object import json import os import time -from urllib.parse import quote, quote_plus, urlencode +from future.moves.urllib.parse import quote, quote_plus, urlencode import plexpy if plexpy.PYTHON_VERSION < 3: diff --git a/plexpy/request.py b/plexpy/request.py index f109b4ad..2c13831a 100644 --- a/plexpy/request.py +++ b/plexpy/request.py @@ -17,7 +17,7 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import str +from future.builtins import str from bs4 import BeautifulSoup from xml.dom import minidom diff --git a/plexpy/session.py b/plexpy/session.py index 81b76356..9b4e3321 100644 --- a/plexpy/session.py +++ b/plexpy/session.py @@ -17,7 +17,7 @@ from __future__ import absolute_import from __future__ import unicode_literals -from builtins import str +from future.builtins import str import cherrypy diff --git a/plexpy/users.py b/plexpy/users.py index 48b7d010..5dd273c3 100644 --- a/plexpy/users.py +++ b/plexpy/users.py @@ -17,11 +17,9 @@ from __future__ import absolute_import from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import next -from builtins import str -from builtins import object +from future.builtins import next +from future.builtins import str +from future.builtins import object import httpagentparser import time diff --git a/plexpy/versioncheck.py b/plexpy/versioncheck.py index 575d4b99..b68f57de 100644 --- a/plexpy/versioncheck.py +++ b/plexpy/versioncheck.py @@ -18,8 +18,8 @@ from __future__ import division from __future__ import absolute_import from __future__ import unicode_literals -from builtins import next -from builtins import str +from future.builtins import next +from future.builtins import str from past.utils import old_div import os diff --git a/plexpy/web_socket.py b/plexpy/web_socket.py index ce5ebfe5..a8aa5cd5 100644 --- a/plexpy/web_socket.py +++ b/plexpy/web_socket.py @@ -19,9 +19,7 @@ from __future__ import absolute_import from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import str +from future.builtins import str import json import threading diff --git a/plexpy/webauth.py b/plexpy/webauth.py index d8f14fef..dcdaf8b4 100644 --- a/plexpy/webauth.py +++ b/plexpy/webauth.py @@ -22,13 +22,11 @@ from __future__ import absolute_import from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import str -from builtins import object +from future.builtins import str +from future.builtins import object from datetime import datetime, timedelta -from urllib.parse import quote, unquote +from future.moves.urllib.parse import quote, unquote import cherrypy from hashing_passwords import check_hash diff --git a/plexpy/webserve.py b/plexpy/webserve.py index c57ae637..05e5bbc0 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -17,19 +17,16 @@ from __future__ import absolute_import from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import next -from builtins import str -from past.builtins import basestring -from builtins import object +from future.builtins import next +from future.builtins import object +from future.builtins import str from io import open import json import os import shutil import threading -import urllib.request, urllib.parse, urllib.error +from future.moves.urllib.parse import urlencode import cherrypy from cherrypy.lib.static import serve_file, serve_download @@ -330,7 +327,7 @@ class WebInterface(object): if '{machine_id}' in endpoint: endpoint = endpoint.format(machine_id=plexpy.CONFIG.PMS_IDENTIFIER) - return base_url + endpoint + '?' + urllib.parse.urlencode(kwargs) + return base_url + endpoint + '?' + urlencode(kwargs) @cherrypy.expose @requireAuth() @@ -5714,7 +5711,7 @@ class WebInterface(object): ``` """ geo_info = helpers.geoip_lookup(ip_address) - if isinstance(geo_info, basestring): + if isinstance(geo_info, str): return {'error': geo_info} return geo_info diff --git a/plexpy/webstart.py b/plexpy/webstart.py index a208bf45..d90dae76 100644 --- a/plexpy/webstart.py +++ b/plexpy/webstart.py @@ -17,14 +17,11 @@ from __future__ import absolute_import from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() -from builtins import str -from builtins import object +from future.builtins import object import os import sys -from urllib.parse import urlencode +from future.moves.urllib.parse import urlencode import cherrypy