Remove uses of future and __future__

Tautulli.py

@@ -23,7 +23,6 @@ import sys
 # Ensure lib added to path, before any other imports
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lib'))
 
-from future.builtins import str
 
 import appdirs
 import argparse

plexpy/__init__.py

@@ -13,14 +13,11 @@
 #  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
-from future.builtins import range
-from future.builtins import str
 
 import ctypes
 import datetime
 import os
-import future.moves.queue as queue
+import queue
 import sqlite3
 import sys
 import subprocess

plexpy/activity_handler.py

@@ -13,9 +13,6 @@
 #  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
-from future.builtins import str
-from future.builtins import object
 
 import datetime
 import os

plexpy/activity_pinger.py

@@ -13,8 +13,6 @@
 #  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
-from future.builtins import str
 
 import threading
 

plexpy/activity_processor.py

@@ -13,9 +13,6 @@
 #  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
-from future.builtins import str
-from future.builtins import object
 
 from collections import defaultdict
 import json

plexpy/api2.py

@@ -16,9 +16,6 @@
 #  along with Tautulli.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import unicode_literals
-from future.builtins import str
-from future.builtins import object
 
 from hashing_passwords import check_hash
 from io import open

plexpy/classes.py

@@ -20,9 +20,8 @@
 #########################################
 
 
-from __future__ import unicode_literals
 
-from future.moves.urllib.request import FancyURLopener
+from urllib.request import FancyURLopener
 
 import plexpy
 from plexpy.common import USER_AGENT

plexpy/common.py

@@ -15,7 +15,6 @@
 #  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
 
 import distro
 import platform

plexpy/config.py

@@ -13,9 +13,6 @@
 #  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
-from future.builtins import object
-from future.builtins import str
 
 import os
 import re

plexpy/database.py

@@ -13,9 +13,6 @@
 #  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
-from future.builtins import str
-from future.builtins import object
 
 import os
 import sqlite3

plexpy/datafactory.py

@@ -15,11 +15,6 @@
 #  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 division
-from __future__ import unicode_literals
-from future.builtins import next
-from future.builtins import str
-from future.builtins import object
 
 import json
 

plexpy/datatables.py

@@ -13,8 +13,6 @@
 #  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
-from future.builtins import object
 
 import re
 

plexpy/exceptions.py

@@ -13,7 +13,6 @@
 #  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/exporter.py

@@ -15,8 +15,6 @@
 #  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
-from future.builtins import str
 import csv
 
 import json

plexpy/graphs.py

@@ -15,10 +15,6 @@
 #  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
-from future.builtins import str
-from future.builtins import range
-from future.builtins import object
 
 import arrow
 import datetime

plexpy/helpers.py

@@ -15,11 +15,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 __future__ import division
-from __future__ import unicode_literals
 
-from future.builtins import zip
-from future.builtins import str
 
 import arrow
 import base64
@@ -50,7 +46,7 @@ import string
 import sys
 import time
 import unicodedata
-from future.moves.urllib.parse import urlencode
+from urllib.parse import urlencode
 from xml.dom import minidom
 import xmltodict
 

plexpy/http_handler.py

@@ -15,12 +15,9 @@
 #  You should have received a copy of the GNU General Public License
 #  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
-from future.builtins import object
-from future.builtins import str
 
 from multiprocessing.dummy import Pool as ThreadPool
-from future.moves.urllib.parse import urljoin
+from urllib.parse import urljoin
 
 import certifi
 import requests

plexpy/libraries.py

@@ -15,10 +15,6 @@
 #  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
-from future.builtins import str
-from future.builtins import next
-from future.builtins import object
 
 import json
 import os

plexpy/lock.py

@@ -15,10 +15,8 @@
 #  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
-from future.builtins import object
 
-import future.moves.queue as queue
+import queue
 import time
 import threading
 

plexpy/log_reader.py

@@ -15,7 +15,6 @@
 #  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
 from io import open
 
 import os

plexpy/logger.py

@@ -15,8 +15,6 @@
 #  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
-from future.builtins import str
 
 from logging import handlers
 

plexpy/mobile_app.py

@@ -15,8 +15,6 @@
 #  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
-from future.builtins import str
 
 import requests
 import threading

plexpy/newsletter_handler.py

@@ -15,7 +15,6 @@
 #  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
 
 from io import open
 import os

plexpy/newsletters.py

@@ -15,10 +15,6 @@
 #  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
-from future.builtins import next
-from future.builtins import str
-from future.builtins import object
 
 import arrow
 from collections import OrderedDict

plexpy/notification_handler.py

@@ -16,12 +16,6 @@
 #  along with Tautulli.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import division
-from __future__ import unicode_literals
-from future.builtins import next
-from future.builtins import map
-from future.builtins import str
-from future.builtins import range
 
 import arrow
 import bleach

plexpy/notifiers.py

@@ -15,9 +15,6 @@
 #  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
-from future.builtins import str
-from future.builtins import object
 
 import base64
 import bleach
@@ -37,8 +34,8 @@ import subprocess
 import sys
 import threading
 import time
-from future.moves.urllib.parse import urlencode
+from urllib.parse import urlencode
-from future.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
 
 try:
     from Cryptodome.Protocol.KDF import PBKDF2

plexpy/plex.py

@@ -15,9 +15,6 @@
 #  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
-from future.builtins import object
-from future.builtins import str
 
 import plexpy
 from plexpy import logger

plexpy/plexivity_import.py

@@ -15,8 +15,6 @@
 #  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
-from future.builtins import str
 
 import arrow
 import sqlite3

plexpy/plextv.py

@@ -15,11 +15,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 __future__ import unicode_literals
+from urllib.parse import unquote
-from future.builtins import next
-from future.builtins import str
-from future.builtins import object
-from future.moves.urllib.parse import unquote
 
 import json
 

plexpy/plexwatch_import.py

@@ -15,8 +15,6 @@
 #  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
-from future.builtins import str
 
 import sqlite3
 from xml.dom import minidom

plexpy/pmsconnect.py

@@ -15,15 +15,11 @@
 #  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
-from future.builtins import next
-from future.builtins import str
-from future.builtins import object
 
 import json
 import os
 import time
-from future.moves.urllib.parse import quote, quote_plus, urlencode
+from urllib.parse import quote, quote_plus, urlencode
 from xml.dom.minidom import Node
 
 import plexpy

plexpy/request.py

@@ -15,8 +15,6 @@
 #  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
-from future.builtins import str
 
 from bs4 import BeautifulSoup
 from xml.dom import minidom

plexpy/session.py

@@ -15,8 +15,6 @@
 #  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
-from future.builtins import str
 
 import cherrypy
 

plexpy/users.py

@@ -15,11 +15,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 __future__ import unicode_literals
+from urllib.parse import parse_qsl
-from future.builtins import next
-from future.builtins import str
-from future.builtins import object
-from future.moves.urllib.parse import parse_qsl
 
 import arrow
 import httpagentparser

plexpy/version.py

@@ -15,7 +15,6 @@
 #  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
 
 PLEXPY_BRANCH = "master"
 PLEXPY_RELEASE_VERSION = "v2.13.2"

plexpy/versioncheck.py

@@ -15,10 +15,6 @@
 #  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 division
-from __future__ import unicode_literals
-from future.builtins import next
-from future.builtins import str
 
 import json
 import os

plexpy/web_socket.py

@@ -17,8 +17,6 @@
 
 # Mostly borrowed from https://github.com/trakt/Plex-Trakt-Scrobbler
 
-from __future__ import unicode_literals
-from future.builtins import str
 
 import json
 import ssl

plexpy/webauth.py

@@ -20,10 +20,9 @@
 # Form based authentication for CherryPy. Requires the
 # Session tool to be loaded.
 
-from future.builtins import object
 
 from datetime import datetime, timedelta
-from future.moves.urllib.parse import quote, unquote
+from urllib.parse import quote, unquote
 
 import cherrypy
 from hashing_passwords import check_hash

plexpy/webserve.py

@@ -15,10 +15,6 @@
 #  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
-from future.builtins import next
-from future.builtins import object
-from future.builtins import str
 import csv
 
 from io import open, BytesIO
@@ -31,7 +27,7 @@ import shutil
 import sys
 import threading
 import zipfile
-from future.moves.urllib.parse import urlencode
+from urllib.parse import urlencode
 
 import cherrypy
 from cherrypy.lib.static import serve_file, serve_fileobj, serve_download