first pass on compat.

plexapi/audio.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
+from urllib.parse import quote_plus
+
 from plexapi import media, utils
 from plexapi.base import Playable, PlexPartialObject
-from plexapi.compat import quote_plus
 
 
 class Audio(PlexPartialObject):

plexapi/base.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import re
+from urllib.parse import quote_plus, urlencode
 
 from plexapi import log, utils
-from plexapi.compat import quote_plus, urlencode
 from plexapi.exceptions import BadRequest, NotFound, UnknownType, Unsupported
 from plexapi.utils import tag_helper
 

plexapi/client.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 import time
+from xml.etree import ElementTree
 
 import requests
 from plexapi import BASE_HEADERS, CONFIG, TIMEOUT, log, logfilter, utils
 from plexapi.base import PlexObject
-from plexapi.compat import ElementTree
 from plexapi.exceptions import BadRequest, NotFound, Unauthorized, Unsupported
 from plexapi.playqueue import PlayQueue
 from requests.status_codes import _codes as codes

plexapi/config.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
 from collections import defaultdict
-from plexapi.compat import ConfigParser
+from configparser import ConfigParser
 
 
 class PlexConfig(ConfigParser):
@@ -13,6 +13,7 @@ class PlexConfig(ConfigParser):
         Parameters:
             path (str): Path of the configuration file to load.
     """
+
     def __init__(self, path):
         ConfigParser.__init__(self)
         self.read(path)

plexapi/library.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
+from urllib.parse import quote, quote_plus, unquote, urlencode
+
 from plexapi import X_PLEX_CONTAINER_SIZE, log, utils
 from plexapi.base import PlexObject
-from plexapi.compat import quote, quote_plus, unquote, urlencode
 from plexapi.exceptions import BadRequest, NotFound
 from plexapi.media import MediaTag
 from plexapi.settings import Setting

plexapi/media.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 
 import xml
+from urllib.parse import quote_plus
 
-from plexapi import compat, log, settings, utils
+from plexapi import log, settings, utils
 from plexapi.base import PlexObject
 from plexapi.exceptions import BadRequest
 from plexapi.utils import cast
@@ -619,7 +620,7 @@ class Poster(PlexObject):
 
     def select(self):
         key = self._initpath[:-1]
-        data = '%s?url=%s' % (key, compat.quote_plus(self.ratingKey))
+        data = '%s?url=%s' % (key, quote_plus(self.ratingKey))
         try:
             self._server.query(data, method=self._server._session.put)
         except xml.etree.ElementTree.ParseError:

plexapi/myplex.py

@@ -2,14 +2,14 @@
 import copy
 import threading
 import time
+from xml.etree import ElementTree
 
 import requests
 from plexapi import (BASE_HEADERS, CONFIG, TIMEOUT, X_PLEX_ENABLE_FAST_CONNECT,
                      X_PLEX_IDENTIFIER, log, logfilter, utils)
 from plexapi.base import PlexObject
-from plexapi.exceptions import BadRequest, NotFound, Unauthorized
 from plexapi.client import PlexClient
-from plexapi.compat import ElementTree
+from plexapi.exceptions import BadRequest, NotFound, Unauthorized
 from plexapi.library import LibrarySection
 from plexapi.server import PlexServer
 from plexapi.sonos import PlexSonosClient

plexapi/photo.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
+from urllib.parse import quote_plus
+
 from plexapi import media, utils
 from plexapi.base import PlexPartialObject
-from plexapi.exceptions import NotFound, BadRequest
-from plexapi.compat import quote_plus
+from plexapi.exceptions import BadRequest, NotFound
 
 
 @utils.registerPlexObject

plexapi/playlist.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
+from urllib.parse import quote_plus
+
 from plexapi import utils
-from plexapi.base import PlexPartialObject, Playable
+from plexapi.base import Playable, PlexPartialObject
 from plexapi.exceptions import BadRequest, Unsupported
 from plexapi.library import LibrarySection
 from plexapi.playqueue import PlayQueue
 from plexapi.utils import cast, toDatetime
-from plexapi.compat import quote_plus
 
 
 @utils.registerPlexObject

plexapi/server.py

@@ -1,23 +1,29 @@
 # -*- coding: utf-8 -*-
+from urllib.parse import urlencode
+from xml.etree import ElementTree
+
 import requests
-from requests.status_codes import _codes as codes
-from plexapi import BASE_HEADERS, CONFIG, TIMEOUT, X_PLEX_CONTAINER_SIZE
-from plexapi import log, logfilter, utils
+# Need these imports to populate utils.PLEXOBJECTS
+from plexapi import (BASE_HEADERS, CONFIG, TIMEOUT, X_PLEX_CONTAINER_SIZE, log,
+                     logfilter)
+from plexapi import media as _media
+from plexapi import photo as _photo
+from plexapi import playlist as _playlist
+from plexapi import utils
+from plexapi import video as _video
 from plexapi.alert import AlertListener
 from plexapi.base import PlexObject
 from plexapi.client import PlexClient
-from plexapi.compat import ElementTree, urlencode
 from plexapi.exceptions import BadRequest, NotFound, Unauthorized
-from plexapi.library import Library, Hub
-from plexapi.settings import Settings
+from plexapi.library import Hub, Library
+from plexapi.media import Conversion, Optimized
 from plexapi.playlist import Playlist
 from plexapi.playqueue import PlayQueue
+from plexapi.settings import Settings
 from plexapi.utils import cast
-from plexapi.media import Optimized, Conversion
+from requests.status_codes import _codes as codes
 
-# Need these imports to populate utils.PLEXOBJECTS
-from plexapi import (audio as _audio, video as _video,        # noqa: F401
-    photo as _photo, media as _media, playlist as _playlist)  # noqa: F401
+from plexapi import audio as _audio  # noqa: F401; noqa: F401
 
 
 class PlexServer(PlexObject):

plexapi/settings.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 from collections import defaultdict
+from urllib.parse import quote
 
 from plexapi import log, utils
 from plexapi.base import PlexObject
-from plexapi.compat import quote, string_type
 from plexapi.exceptions import BadRequest, NotFound
 
 
@@ -106,7 +106,7 @@ class Setting(PlexObject):
         'bool': {'type': bool, 'cast': _bool_cast, 'tostr': _bool_str},
         'double': {'type': float, 'cast': float, 'tostr': _str},
         'int': {'type': int, 'cast': int, 'tostr': _str},
-        'text': {'type': string_type, 'cast': _str, 'tostr': _str},
+        'text': {'type': str, 'cast': _str, 'tostr': _str},
     }
 
     def _loadData(self, data):

plexapi/utils.py

@@ -7,9 +7,9 @@ import zipfile
 from datetime import datetime
 from getpass import getpass
 from threading import Event, Thread
+from urllib.parse import quote
 
 import requests
-from plexapi import compat
 from plexapi.exceptions import NotFound
 
 try:
@@ -41,7 +41,7 @@ class SecretsFilter(logging.Filter):
     def filter(self, record):
         cleanargs = list(record.args)
         for i in range(len(cleanargs)):
-            if isinstance(cleanargs[i], compat.string_type):
+            if isinstance(cleanargs[i], str):
                 for secret in self.secrets:
                     cleanargs[i] = cleanargs[i].replace(secret, '<hidden>')
         record.args = tuple(cleanargs)
@@ -99,8 +99,8 @@ def joinArgs(args):
         return ''
     arglist = []
     for key in sorted(args, key=lambda x: x.lower()):
-        value = compat.ustr(args[key])
-        arglist.append('%s=%s' % (key, compat.quote(value, safe='')))
+        value = str(args[key])
+        arglist.append('%s=%s' % (key, quote(value, safe='')))
     return '?%s' % '&'.join(arglist)
 
 
@@ -148,8 +148,8 @@ def searchType(libtype):
         Raises:
             :class:`plexapi.exceptions.NotFound`: Unknown libtype
     """
-    libtype = compat.ustr(libtype)
-    if libtype in [compat.ustr(v) for v in SEARCHTYPES.values()]:
+    libtype = str(libtype)
+    if libtype in [str(v) for v in SEARCHTYPES.values()]:
         return libtype
     if SEARCHTYPES.get(libtype) is not None:
         return SEARCHTYPES[libtype]
@@ -275,7 +275,7 @@ def download(url, token, filename=None, savepath=None, session=None, chunksize=4
     response = session.get(url, headers=headers, stream=True)
     # make sure the savepath directory exists
     savepath = savepath or os.getcwd()
-    compat.makedirs(savepath, exist_ok=True)
+    os.makedirs(savepath, exist_ok=True)
 
     # try getting filename from header if not specified in arguments (used for logs, db)
     if not filename and response.headers.get('Content-Disposition'):

plexapi/video.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
-from plexapi import media, utils
-from plexapi.exceptions import BadRequest, NotFound
-from plexapi.base import Playable, PlexPartialObject
-from plexapi.compat import quote_plus, urlencode
 import os
+from urllib.parse import quote_plus, urlencode
+
+from plexapi import media, utils
+from plexapi.base import Playable, PlexPartialObject
+from plexapi.exceptions import BadRequest, NotFound
 
 
 class Video(PlexPartialObject):