aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Crute <mcrute@gmail.com>2016-01-09 13:41:09 -0800
committerMike Crute <mcrute@gmail.com>2016-01-09 13:41:09 -0800
commitcedd57fbe4a40c171847de1ad0c714b5447d8065 (patch)
tree93723bbab0180ce0628ab64a77c86e8614302eb6
parent0705462ee5644d57d825e37a295a5f698247aba0 (diff)
downloadpydora-cedd57fbe4a40c171847de1ad0c714b5447d8065.tar.bz2
pydora-cedd57fbe4a40c171847de1ad0c714b5447d8065.tar.xz
pydora-cedd57fbe4a40c171847de1ad0c714b5447d8065.zip
Simplify exception handling
-rw-r--r--pandora/models/pandora.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/pandora/models/pandora.py b/pandora/models/pandora.py
index 7c134e1..d0c6aab 100644
--- a/pandora/models/pandora.py
+++ b/pandora/models/pandora.py
@@ -240,12 +240,7 @@ class AdItem(PlaylistModel):
240 try: 240 try:
241 self.register_ad(self.station_id) 241 self.register_ad(self.station_id)
242 except ParameterMissing as e: 242 except ParameterMissing as e:
243 if not self.tracking_tokens: 243 if self.tracking_tokens:
244 # Ignore registration attempts if no ad tracking tokens are
245 # available
246 pass
247 else:
248 # Unexpected error, re-raise.
249 raise e 244 raise e
250 return super(AdItem, self).prepare_playback() 245 return super(AdItem, self).prepare_playback()
251 246