diff options
Diffstat (limited to 'pandora/models/pandora.py')
-rw-r--r-- | pandora/models/pandora.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pandora/models/pandora.py b/pandora/models/pandora.py index d7d2bf1..71a1d51 100644 --- a/pandora/models/pandora.py +++ b/pandora/models/pandora.py | |||
@@ -253,8 +253,8 @@ class Bookmark(PandoraModel): | |||
253 | 253 | ||
254 | class BookmarkList(PandoraModel): | 254 | class BookmarkList(PandoraModel): |
255 | 255 | ||
256 | songs = Field("songs", formatter=Bookmark.from_json_list) | 256 | songs = Field("songs", model=Bookmark) |
257 | artists = Field("artists", formatter=Bookmark.from_json_list) | 257 | artists = Field("artists", model=Bookmark) |
258 | 258 | ||
259 | 259 | ||
260 | class SearchResultItem(PandoraModel): | 260 | class SearchResultItem(PandoraModel): |
@@ -344,11 +344,9 @@ class SearchResult(PandoraModel): | |||
344 | 344 | ||
345 | nearest_matches_available = Field("nearMatchesAvailable") | 345 | nearest_matches_available = Field("nearMatchesAvailable") |
346 | explanation = Field("explanation") | 346 | explanation = Field("explanation") |
347 | songs = Field("songs", formatter=SongSearchResultItem.from_json_list) | 347 | songs = Field("songs", model=SongSearchResultItem) |
348 | artists = Field("artists", formatter=ArtistSearchResultItem.from_json_list) | 348 | artists = Field("artists", model=ArtistSearchResultItem) |
349 | genre_stations = Field( | 349 | genre_stations = Field("genreStations", model=GenreStationSearchResultItem) |
350 | "genreStations", | ||
351 | formatter=GenreStationSearchResultItem.from_json_list) | ||
352 | 350 | ||
353 | 351 | ||
354 | class GenreStationList(PandoraDictListModel): | 352 | class GenreStationList(PandoraDictListModel): |