Upgrade Python syntax with pyupgrade --py3-plus

6 files changed, 18 insertions, 18 deletions

diff --git a/pandora/client.py b/pandora/client.py
index b077954..bb30738 100644
--- a/pandora/client.py
+++ b/pandora/client.py
@@ -16,7 +16,7 @@ instance of a client.
 from . import errors
 
 
-class BaseAPIClient(object):
+class BaseAPIClient:
     """Base Pandora API Client
 
     The base API client has lower level methods that are composed together to
diff --git a/pandora/clientbuilder.py b/pandora/clientbuilder.py
index 7543df7..bc55cec 100644
--- a/pandora/clientbuilder.py
+++ b/pandora/clientbuilder.py
@@ -30,7 +30,7 @@ class TranslatingDict(dict):
     VALUE_TRANSLATIONS = None
 
     def __init__(self, initial=None):
-        super(TranslatingDict, self).__init__()
+        super().__init__()
 
         assert self.KEY_TRANSLATIONS is not None
         assert self.VALUE_TRANSLATIONS is not None
@@ -70,11 +70,11 @@ class TranslatingDict(dict):
 
     def __setitem__(self, key, value):
         key = self.translate_key(key)
-        super(TranslatingDict, self).__setitem__(
+        super().__setitem__(
             key, self.translate_value(key, value))
 
 
-class APIClientBuilder(object):
+class APIClientBuilder:
     """Abstract API Client Builder
 
     Provides the basic functions for building an API client. Expects a
@@ -141,7 +141,7 @@ class SettingsDictBuilder(APIClientBuilder):
 
     def __init__(self, settings, **kwargs):
         self.settings = settings
-        super(SettingsDictBuilder, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def build(self):
         settings = SettingsDict(self.settings)
@@ -160,7 +160,7 @@ class FileBasedClientBuilder(APIClientBuilder):
     def __init__(self, path=None, authenticate=True, **kwargs):
         self.path = path or self.DEFAULT_CONFIG_FILE
         self.authenticate = authenticate
-        super(FileBasedClientBuilder, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     @property
     def file_exists(self):
diff --git a/pandora/errors.py b/pandora/errors.py
index ba377b5..c978708 100644
--- a/pandora/errors.py
+++ b/pandora/errors.py
@@ -56,7 +56,7 @@ class PandoraException(Exception):
 
     def __init__(self, extended_message=""):
         self.extended_message = extended_message
-        super(PandoraException, self).__init__(self.message)
+        super().__init__(self.message)
 
     @classmethod
     def from_code(cls, code, extended_message):
diff --git a/pandora/models/_base.py b/pandora/models/_base.py
index 214f3c1..5689cdf 100644
--- a/pandora/models/_base.py
+++ b/pandora/models/_base.py
@@ -26,7 +26,7 @@ class Field(namedtuple("Field", ["field", "default", "formatter", "model"])):
     """
 
     def __new__(cls, field, default=None, formatter=None, model=None):
-        return super(Field, cls).__new__(cls, field, default, formatter, model)
+        return super().__new__(cls, field, default, formatter, model)
 
 
 class SyntheticField(namedtuple("SyntheticField", ["field"])):
@@ -84,10 +84,10 @@ class ModelMetaClass(type):
                 fields[key] = val
                 del new_dct[key]
 
-        return super(ModelMetaClass, cls).__new__(cls, name, parents, new_dct)
+        return super().__new__(cls, name, parents, new_dct)
 
 
-class PandoraModel(object, metaclass=ModelMetaClass):
+class PandoraModel(metaclass=ModelMetaClass):
     """Pandora API Model
 
     A single object representing a Pandora data object. Subclasses are
@@ -208,7 +208,7 @@ class PandoraListModel(PandoraModel, list):
     __index_key__ = None
 
     def __init__(self, *args, **kwargs):
-        super(PandoraListModel, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self._index = {}
 
     @classmethod
diff --git a/pandora/models/ad.py b/pandora/models/ad.py
index 91820c9..040c76b 100644
--- a/pandora/models/ad.py
+++ b/pandora/models/ad.py
@@ -33,7 +33,7 @@ class AdItem(PlaylistModel):
         except ParameterMissing as exc:
             if self.tracking_tokens:
                 raise exc
-        return super(AdItem, self).prepare_playback()
+        return super().prepare_playback()
 
     def thumbs_up(self):  # pragma: no cover
         return
diff --git a/pandora/transport.py b/pandora/transport.py
index 6f1a174..721882d 100644
--- a/pandora/transport.py
+++ b/pandora/transport.py
@@ -94,12 +94,12 @@ class RetryingSession(requests.Session):
     """
 
     def __init__(self):
-        super(RetryingSession, self).__init__()
+        super().__init__()
         self.mount('https://', HTTPAdapter(max_retries=3))
         self.mount('http://', HTTPAdapter(max_retries=3))
 
 
-class APITransport(object):
+class APITransport:
     """Pandora API Transport
 
     The transport is responsible for speaking the low-level protocol required
@@ -161,7 +161,7 @@ class APITransport(object):
         return int(self.server_sync_time + (time.time() - self.start_time))
 
     def remove_empty_values(self, data):
-        return dict((k, v) for k, v in data.items() if v is not None)
+        return {k: v for k, v in data.items() if v is not None}
 
     @sync_time.setter
     def sync_time(self, sync_time):
@@ -198,7 +198,7 @@ class APITransport(object):
         }
 
     def _build_url(self, method):
-        return "{0}://{1}".format(
+        return "{}://{}".format(
             "https" if method in self.REQUIRE_TLS else "http",
             self.api_host)
 
@@ -236,7 +236,7 @@ class APITransport(object):
         return self._parse_response(result)
 
 
-class BlowfishCryptor(object):
+class BlowfishCryptor:
     """Low-Level Blowfish Cryptography
 
     Handles symmetric Blowfish cryptography of raw byte messages with or
@@ -285,7 +285,7 @@ class PurePythonBlowfish(BlowfishCryptor):
         return b"".join(self.cipher.encrypt_ecb(self._add_padding(data)))
 
 
-class Encryptor(object):
+class Encryptor:
     """Pandora Blowfish Encryptor
 
     The blowfish encryptor can encrypt and decrypt the relevant parts of the