Merge pull request #492 from pkkid/drop-py2

Drop py2 support

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/compat.py

@@ -1,118 +0,0 @@
-# -*- coding: utf-8 -*-
-# Python 2/3 compatability
-# Always try Py3 first
-import os
-import sys
-from sys import version_info
-
-ustr = str
-if version_info < (3,):
-    ustr = unicode
-
-try:
-    string_type = basestring
-except NameError:
-    string_type = str
-
-try:
-    from urllib.parse import urlencode
-except ImportError:
-    from urllib import urlencode
-
-try:
-    from urllib.parse import quote
-except ImportError:
-    from urllib import quote
-
-try:
-    from urllib.parse import quote_plus, quote
-except ImportError:
-    from urllib import quote_plus, quote
-
-try:
-    from urllib.parse import unquote
-except ImportError:
-    from urllib import unquote
-
-try:
-    from configparser import ConfigParser
-except ImportError:
-    from ConfigParser import ConfigParser
-
-try:
-    from xml.etree import cElementTree as ElementTree
-except ImportError:
-    from xml.etree import ElementTree
-
-
-def makedirs(name, mode=0o777, exist_ok=False):
-    """ Mimicks os.makedirs() from Python 3. """
-    try:
-        os.makedirs(name, mode)
-    except OSError:
-        if not os.path.isdir(name) or not exist_ok:
-            raise
-
-
-def which(cmd, mode=os.F_OK | os.X_OK, path=None):
-    """Given a command, mode, and a PATH string, return the path which
-    conforms to the given mode on the PATH, or None if there is no such
-    file.
-
-    `mode` defaults to os.F_OK | os.X_OK. `path` defaults to the result
-    of os.environ.get("PATH"), or can be overridden with a custom search
-    path.
-
-    Copied from https://hg.python.org/cpython/file/default/Lib/shutil.py
-    """
-    # Check that a given file can be accessed with the correct mode.
-    # Additionally check that `file` is not a directory, as on Windows
-    # directories pass the os.access check.
-    def _access_check(fn, mode):
-        return (os.path.exists(fn) and os.access(fn, mode)
-                and not os.path.isdir(fn))
-
-    # If we're given a path with a directory part, look it up directly rather
-    # than referring to PATH directories. This includes checking relative to the
-    # current directory, e.g. ./script
-    if os.path.dirname(cmd):
-        if _access_check(cmd, mode):
-            return cmd
-        return None
-
-    if path is None:
-        path = os.environ.get("PATH", os.defpath)
-    if not path:
-        return None
-    path = path.split(os.pathsep)
-
-    if sys.platform == "win32":
-        # The current directory takes precedence on Windows.
-        if not os.curdir in path:
-            path.insert(0, os.curdir)
-
-        # PATHEXT is necessary to check on Windows.
-        pathext = os.environ.get("PATHEXT", "").split(os.pathsep)
-        # See if the given file matches any of the expected path extensions.
-        # This will allow us to short circuit when given "python.exe".
-        # If it does match, only test that one, otherwise we have to try
-        # others.
-        if any(cmd.lower().endswith(ext.lower()) for ext in pathext):
-            files = [cmd]
-        else:
-            files = [cmd + ext for ext in pathext]
-    else:
-        # On other platforms you don't have things like PATHEXT to tell you
-        # what file suffixes are executable, so just pass on cmd as-is.
-        files = [cmd]
-
-    seen = set()
-    for dir in path:
-        normdir = os.path.normcase(dir)
-        if not normdir in seen:
-            seen.add(normdir)
-            for thefile in files:
-                name = os.path.join(dir, thefile)
-                if _access_check(name, mode):
-                    return name
-    return None

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  # noqa: F401
+from plexapi import photo as _photo  # noqa: F401
+from plexapi import playlist as _playlist  # noqa: F401
+from plexapi import utils
+from plexapi import video as _video  # noqa: F401
 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):

tests/conftest.py

@@ -7,7 +7,6 @@ from os import environ
 import plexapi
 import pytest
 import requests
-from plexapi import compat
 from plexapi.client import PlexClient
 from plexapi.myplex import MyPlexAccount
 from plexapi.server import PlexServer
@@ -354,7 +353,7 @@ def is_section(key):
 
 
 def is_string(value, gte=1):
-    return isinstance(value, compat.string_type) and len(value) >= gte
+    return isinstance(value, str) and len(value) >= gte
 
 
 def is_thumb(key):

tests/test_video.py

@@ -2,10 +2,10 @@
 import os
 from datetime import datetime
 from time import sleep
+from urllib.parse import quote_plus
 
 import pytest
 from plexapi.exceptions import BadRequest, NotFound
-from plexapi.compat import quote_plus
 
 from . import conftest as utils
 

tools/plex-bootstraptest.py

@@ -16,12 +16,12 @@ import shutil
 import socket
 import time
 from glob import glob
-from shutil import copyfile
+from os import makedirs
+from shutil import copyfile, which
 from subprocess import call
 from uuid import uuid4
 
 import plexapi
-from plexapi.compat import makedirs, which
 from plexapi.exceptions import BadRequest, NotFound
 from plexapi.myplex import MyPlexAccount
 from plexapi.server import PlexServer

tools/plex-download.py

@@ -10,10 +10,9 @@ Original contribution by lad1337.
 import argparse
 import os
 import re
-import shutil
+from urllib.parse import unquote
 
 from plexapi import utils
-from plexapi.compat import unquote
 from plexapi.video import Episode, Movie, Show
 
 VALID_TYPES = (Movie, Episode, Show)
@@ -63,7 +62,7 @@ def get_item_from_url(url):
         raise SystemExit('Unknown or ambiguous client id: %s' % clientid)
     server = servers[0].connect()
     return server.fetchItem(key)
-	
+
 if __name__ == '__main__':
     # Command line parser
     from plexapi import CONFIG
@@ -73,7 +72,7 @@ if __name__ == '__main__':
                         default=CONFIG.get('auth.myplex_username'))
     parser.add_argument('-p', '--password', help='Your Plex password',
                         default=CONFIG.get('auth.myplex_password'))
-    parser.add_argument('--url', default=None, help='Download from URL (only paste after !)')	
+    parser.add_argument('--url', default=None, help='Download from URL (only paste after !)')
     opts = parser.parse_args()
     # Search item to download
     account = utils.getMyPlexAccount(opts)
@@ -86,4 +85,3 @@ if __name__ == '__main__':
             filepath = utils.download(url, token=account.authenticationToken, filename=filename, savepath=os.getcwd(),
                                       session=item._server._session, showstatus=True)
             #print('  %s' % filepath)
-