5 files changed, 42 insertions, 35 deletions

diff --git a/pandora/models/_base.py b/pandora/models/_base.py
index 6975d0a..8904be1 100644
--- a/pandora/models/_base.py
+++ b/pandora/models/_base.py
@@ -71,7 +71,6 @@ class DateField(SyntheticField):
 
 
 class ModelMetaClass(type):
-
     def __new__(cls, name, parents, dct):
         dct["_fields"] = fields = {}
         new_dct = dct.copy()
@@ -159,7 +158,8 @@ class PandoraModel(metaclass=ModelMetaClass):
         """
         items = [
             "=".join((key, repr(getattr(self, key))))
-            for key in sorted(self._fields.keys())]
+            for key in sorted(self._fields.keys())
+        ]
 
         if items:
             output = ", ".join(items)
@@ -167,8 +167,9 @@ class PandoraModel(metaclass=ModelMetaClass):
             output = None
 
         if and_also:
-            return "{}({}, {})".format(self.__class__.__name__,
-                                       output, and_also)
+            return "{}({}, {})".format(
+                self.__class__.__name__, output, and_also
+            )
         else:
             return "{}({})".format(self.__class__.__name__, output)
 
@@ -301,7 +302,8 @@ class PandoraDictListModel(PandoraModel, dict):
 
             for part in item[self.__list_key__]:
                 self[key].append(
-                    cls.__list_model__.from_json(api_client, part))
+                    cls.__list_model__.from_json(api_client, part)
+                )
 
         return self
 
diff --git a/pandora/models/ad.py b/pandora/models/ad.py
index ad4b7b0..48cd302 100644
--- a/pandora/models/ad.py
+++ b/pandora/models/ad.py
@@ -24,8 +24,9 @@ class AdItem(PlaylistModel):
         if self.tracking_tokens:
             self._api_client.register_ad(station_id, self.tracking_tokens)
         else:
-            raise ParameterMissing('No ad tracking tokens provided for '
-                                   'registration.')
+            raise ParameterMissing(
+                "No ad tracking tokens provided for registration."
+            )
 
     def prepare_playback(self):
         try:
diff --git a/pandora/models/playlist.py b/pandora/models/playlist.py
index 38afb00..8e0d22e 100644
--- a/pandora/models/playlist.py
+++ b/pandora/models/playlist.py
@@ -5,15 +5,15 @@ from ._base import Field, SyntheticField, PandoraModel, PandoraListModel
 
 
 class AdditionalAudioUrl(Enum):
-    HTTP_40_AAC_MONO = 'HTTP_40_AAC_MONO'
-    HTTP_64_AAC = 'HTTP_64_AAC'
-    HTTP_32_AACPLUS = 'HTTP_32_AACPLUS'
-    HTTP_64_AACPLUS = 'HTTP_64_AACPLUS'
-    HTTP_24_AACPLUS_ADTS = 'HTTP_24_AACPLUS_ADTS'
-    HTTP_32_AACPLUS_ADTS = 'HTTP_32_AACPLUS_ADTS'
-    HTTP_64_AACPLUS_ADTS = 'HTTP_64_AACPLUS_ADTS'
-    HTTP_128_MP3 = 'HTTP_128_MP3'
-    HTTP_32_WMA = 'HTTP_32_WMA'
+    HTTP_40_AAC_MONO = "HTTP_40_AAC_MONO"
+    HTTP_64_AAC = "HTTP_64_AAC"
+    HTTP_32_AACPLUS = "HTTP_32_AACPLUS"
+    HTTP_64_AACPLUS = "HTTP_64_AACPLUS"
+    HTTP_24_AACPLUS_ADTS = "HTTP_24_AACPLUS_ADTS"
+    HTTP_32_AACPLUS_ADTS = "HTTP_32_AACPLUS_ADTS"
+    HTTP_64_AACPLUS_ADTS = "HTTP_64_AACPLUS_ADTS"
+    HTTP_128_MP3 = "HTTP_128_MP3"
+    HTTP_32_WMA = "HTTP_32_WMA"
 
 
 class PandoraType(Enum):
@@ -28,14 +28,14 @@ class PandoraType(Enum):
 
     @staticmethod
     def from_string(value):
-        return {
+        types = {
             "TR": PandoraType.TRACK,
             "AR": PandoraType.ARTIST,
-        }.get(value, PandoraType.GENRE)
+        }
+        return types.get(value, PandoraType.GENRE)
 
 
 class AudioField(SyntheticField):
-
     def formatter(self, api_client, data, newval):
         """Get audio-related fields
 
@@ -61,9 +61,11 @@ class AudioField(SyntheticField):
         elif not url_map:  # No audio url available (e.g. ad tokens)
             return None
 
-        valid_audio_formats = [BaseAPIClient.HIGH_AUDIO_QUALITY,
-                               BaseAPIClient.MED_AUDIO_QUALITY,
-                               BaseAPIClient.LOW_AUDIO_QUALITY]
+        valid_audio_formats = [
+            BaseAPIClient.HIGH_AUDIO_QUALITY,
+            BaseAPIClient.MED_AUDIO_QUALITY,
+            BaseAPIClient.LOW_AUDIO_QUALITY,
+        ]
 
         # Only iterate over sublist, starting at preferred audio quality, or
         # from the beginning of the list if nothing is found. Ensures that the
@@ -84,7 +86,6 @@ class AudioField(SyntheticField):
 
 
 class AdditionalUrlField(SyntheticField):
-
     def formatter(self, api_client, data, newval):
         """Parse additional url fields and map them to inputs
 
@@ -94,7 +95,7 @@ class AdditionalUrlField(SyntheticField):
         if newval is None:
             return None
 
-        user_param = data['_paramAdditionalUrls']
+        user_param = data["_paramAdditionalUrls"]
         urls = {}
         if isinstance(newval, str):
             urls[user_param[0]] = newval
@@ -105,7 +106,6 @@ class AdditionalUrlField(SyntheticField):
 
 
 class PlaylistModel(PandoraModel):
-
     def get_is_playable(self):
         if not self.audio_url:
             return False
diff --git a/pandora/models/search.py b/pandora/models/search.py
index 94e6ee6..fe31561 100644
--- a/pandora/models/search.py
+++ b/pandora/models/search.py
@@ -12,13 +12,15 @@ class SearchResultItem(PandoraModel):
 
     @property
     def is_artist(self):
-        return isinstance(self, ArtistSearchResultItem) and \
-               self.token.startswith("R")
+        return isinstance(
+            self, ArtistSearchResultItem
+        ) and self.token.startswith("R")
 
     @property
     def is_composer(self):
-        return isinstance(self, ArtistSearchResultItem) and \
-               self.token.startswith("C")
+        return isinstance(
+            self, ArtistSearchResultItem
+        ) and self.token.startswith("C")
 
     @property
     def is_genre_station(self):
@@ -36,8 +38,9 @@ class SearchResultItem(PandoraModel):
         elif data["musicToken"].startswith("G"):
             return GenreStationSearchResultItem.from_json(api_client, data)
         else:
-            raise NotImplementedError("Unknown result token type '{}'"
-                                      .format(data["musicToken"]))
+            raise NotImplementedError(
+                "Unknown result token type '{}'".format(data["musicToken"])
+            )
 
 
 class ArtistSearchResultItem(SearchResultItem):
diff --git a/pandora/models/station.py b/pandora/models/station.py
index a1880ec..d3f6552 100644
--- a/pandora/models/station.py
+++ b/pandora/models/station.py
@@ -80,8 +80,7 @@ class Station(PandoraModel):
     feedback = Field("feedback", model=StationFeedback)
 
     def get_playlist(self, additional_urls=None):
-        return iter(self._api_client.get_playlist(self.token,
-                                                  additional_urls))
+        return iter(self._api_client.get_playlist(self.token, additional_urls))
 
 
 class StationList(PandoraListModel):
@@ -105,8 +104,10 @@ class GenreStation(PandoraModel):
     category = Field("categoryName")
 
     def get_playlist(self):
-        raise NotImplementedError("Genre stations do not have playlists. "
-                                  "Create a real station using the token.")
+        raise NotImplementedError(
+            "Genre stations do not have playlists. "
+            "Create a real station using the token."
+        )
 
 
 class GenreStationList(PandoraDictListModel):