aboutsummaryrefslogtreecommitdiff
path: root/pandora/client.py
diff options
context:
space:
mode:
Diffstat (limited to 'pandora/client.py')
-rw-r--r--pandora/client.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/pandora/client.py b/pandora/client.py
index 658fb0d..b077954 100644
--- a/pandora/client.py
+++ b/pandora/client.py
@@ -103,7 +103,7 @@ class APIClient(BaseAPIClient):
103 """ 103 """
104 104
105 def get_station_list(self): # pragma: no cover 105 def get_station_list(self): # pragma: no cover
106 from .models.pandora import StationList 106 from .models.station import StationList
107 107
108 return StationList.from_json(self, 108 return StationList.from_json(self,
109 self("user.getStationList", 109 self("user.getStationList",
@@ -113,7 +113,7 @@ class APIClient(BaseAPIClient):
113 return self("user.getStationListChecksum")["checksum"] 113 return self("user.getStationListChecksum")["checksum"]
114 114
115 def get_playlist(self, station_token, additional_urls=None): 115 def get_playlist(self, station_token, additional_urls=None):
116 from .models.pandora import Playlist 116 from .models.playlist import Playlist
117 117
118 if additional_urls is None: 118 if additional_urls is None:
119 additional_urls = [] 119 additional_urls = []
@@ -143,13 +143,13 @@ class APIClient(BaseAPIClient):
143 return playlist 143 return playlist
144 144
145 def get_bookmarks(self): # pragma: no cover 145 def get_bookmarks(self): # pragma: no cover
146 from .models.pandora import BookmarkList 146 from .models.bookmark import BookmarkList
147 147
148 return BookmarkList.from_json(self, 148 return BookmarkList.from_json(self,
149 self("user.getBookmarks")) 149 self("user.getBookmarks"))
150 150
151 def get_station(self, station_token): # pragma: no cover 151 def get_station(self, station_token): # pragma: no cover
152 from .models.pandora import Station 152 from .models.station import Station
153 153
154 return Station.from_json(self, 154 return Station.from_json(self,
155 self("station.getStation", 155 self("station.getStation",
@@ -175,7 +175,7 @@ class APIClient(BaseAPIClient):
175 def search(self, search_text, 175 def search(self, search_text,
176 include_near_matches=False, 176 include_near_matches=False,
177 include_genre_stations=False): # pragma: no cover 177 include_genre_stations=False): # pragma: no cover
178 from .models.pandora import SearchResult 178 from .models.search import SearchResult
179 179
180 return SearchResult.from_json( 180 return SearchResult.from_json(
181 self, 181 self,
@@ -197,7 +197,7 @@ class APIClient(BaseAPIClient):
197 197
198 def create_station(self, search_token=None, artist_token=None, 198 def create_station(self, search_token=None, artist_token=None,
199 track_token=None): 199 track_token=None):
200 from .models.pandora import Station 200 from .models.station import Station
201 201
202 kwargs = {} 202 kwargs = {}
203 203
@@ -226,7 +226,7 @@ class APIClient(BaseAPIClient):
226 stationToken=station_token) 226 stationToken=station_token)
227 227
228 def get_genre_stations(self): 228 def get_genre_stations(self):
229 from .models.pandora import GenreStationList 229 from .models.station import GenreStationList
230 230
231 genre_stations = GenreStationList.from_json( 231 genre_stations = GenreStationList.from_json(
232 self, self("station.getGenreStations")) 232 self, self("station.getGenreStations"))
@@ -270,7 +270,7 @@ class APIClient(BaseAPIClient):
270 email=emails[0]) 270 email=emails[0])
271 271
272 def get_ad_item(self, station_id, ad_token): 272 def get_ad_item(self, station_id, ad_token):
273 from .models.pandora import AdItem 273 from .models.ad import AdItem
274 274
275 if not station_id: 275 if not station_id:
276 raise errors.ParameterMissing("The 'station_id' param must be " 276 raise errors.ParameterMissing("The 'station_id' param must be "