Update all future imports for Python 2

Tautulli.py

@@ -17,7 +17,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with Tautulli.  If not, see <http://www.gnu.org/licenses/>.
 
-from builtins import str
+from future.builtins import str
 
 import os
 import sys

plexpy/__init__.py

@@ -15,13 +15,11 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from future import standard_library
+from future.builtins import range
-standard_library.install_aliases()
-from builtins import range
 
 import datetime
 import os
-import queue
+import future.moves.queue as queue
 import sqlite3
 import sys
 import subprocess

plexpy/activity_handler.py

@@ -15,8 +15,8 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from builtins import str
+from future.builtins import str
-from builtins import object
+from future.builtins import object
 
 import datetime
 import os

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

plexpy/activity_processor.py

@@ -15,8 +15,8 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from builtins import str
+from future.builtins import str
-from builtins import object
+from future.builtins import object
 
 from collections import defaultdict
 import json

plexpy/api2.py

@@ -18,8 +18,8 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from builtins import str
+from future.builtins import str
-from builtins import object
+from future.builtins import object
 
 import hashlib
 import inspect

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:

plexpy/config.py

@@ -15,8 +15,8 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from past.builtins import basestring
+from future.builtins import object
-from 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())
 

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

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 future.builtins import next
-from builtins import str
+from future.builtins import str
-from builtins import object
+from future.builtins import object
 from past.utils import old_div
 
 import json

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
 

plexpy/graphs.py

@@ -17,9 +17,9 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from builtins import str
+from future.builtins import str
-from builtins import range
+from future.builtins import range
-from builtins import object
+from future.builtins import object
 
 import datetime
 

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 future.builtins import zip
-from builtins import str
+from future.builtins import str
-from past.builtins import basestring
 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('<', '&lt;').replace('>', '&gt;')
     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
 

plexpy/http_handler.py

@@ -17,15 +17,12 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from future import standard_library
+from future.builtins import object
-standard_library.install_aliases()
+from future.builtins import str
-from past.builtins import basestring
-from builtins import object
-from 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

plexpy/libraries.py

@@ -17,9 +17,9 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from builtins import str
+from future.builtins import str
-from builtins import next
+from future.builtins import next
-from builtins import object
+from future.builtins import object
 
 import json
 import os

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
 

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

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
 

plexpy/newsletters.py

@@ -17,9 +17,9 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from builtins import next
+from future.builtins import next
-from builtins import str
+from future.builtins import str
-from builtins import object
+from future.builtins import object
 
 import arrow
 from collections import OrderedDict

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
+from future.builtins import next
-standard_library.install_aliases()
+from future.builtins import map
-from builtins import next
+from future.builtins import str
-from builtins import map
+from future.builtins import range
-from builtins import str
-from builtins import range
 from past.builtins import basestring
 from past.utils import old_div
 

plexpy/notifiers.py

@@ -17,11 +17,9 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from future import standard_library
+from future.builtins import next
-standard_library.install_aliases()
+from future.builtins import str
-from builtins import next
+from future.builtins import object
-from builtins import str
-from 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 future.moves.urllib.parse import urlencode
-from urllib.parse import urlparse
+from future.moves.urllib.parse import urlparse
 
 try:
     from Cryptodome.Protocol.KDF import PBKDF2

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

plexpy/plextv.py

@@ -17,9 +17,9 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from builtins import next
+from future.builtins import next
-from builtins import str
+from future.builtins import str
-from builtins import object
+from future.builtins import object
 
 import base64
 import json

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

plexpy/pmsconnect.py

@@ -17,16 +17,14 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from future import standard_library
+from future.builtins import next
-standard_library.install_aliases()
+from future.builtins import str
-from builtins import next
+from future.builtins import object
-from builtins import str
-from 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:

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

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
 

plexpy/users.py

@@ -17,11 +17,9 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from future import standard_library
+from future.builtins import next
-standard_library.install_aliases()
+from future.builtins import str
-from builtins import next
+from future.builtins import object
-from builtins import str
-from builtins import object
 
 import httpagentparser
 import time

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 future.builtins import next
-from builtins import str
+from future.builtins import str
 from past.utils import old_div
 
 import os

plexpy/web_socket.py

@@ -19,9 +19,7 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from future import standard_library
+from future.builtins import str
-standard_library.install_aliases()
-from builtins import str
 
 import json
 import threading

plexpy/webauth.py

@@ -22,13 +22,11 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from future import standard_library
+from future.builtins import str
-standard_library.install_aliases()
+from future.builtins import object
-from builtins import str
-from 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

plexpy/webserve.py

@@ -17,19 +17,16 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from future import standard_library
+from future.builtins import next
-standard_library.install_aliases()
+from future.builtins import object
-from builtins import next
+from future.builtins import str
-from builtins import str
-from past.builtins import basestring
-from builtins import object
 
 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
 

plexpy/webstart.py

@@ -17,14 +17,11 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
-from future import standard_library
+from future.builtins import object
-standard_library.install_aliases()
-from builtins import str
-from builtins import object
 
 import os
 import sys
-from urllib.parse import urlencode
+from future.moves.urllib.parse import urlencode
 
 import cherrypy