From 5877ab7b2e63b0065076d8f5ae09bea7a8b51ba8 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 4 Mar 2012 13:12:11 +0100
Subject: [PATCH] Let the jukebox crash naturally on uncaught exceptions

---
 examples/jukebox.py | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/examples/jukebox.py b/examples/jukebox.py
index 856dcf56..4832453a 100755
--- a/examples/jukebox.py
+++ b/examples/jukebox.py
@@ -3,13 +3,12 @@
 import sys
 import cmd
 import time
-import traceback
 import threading
 
 from spotify import ArtistBrowser, Link, ToplistBrowser
 from spotify.audiosink import import_audio_sink
 from spotify.manager import (SpotifySessionManager, SpotifyPlaylistManager,
-        SpotifyContainerManager)
+    SpotifyContainerManager)
 
 AudioSink = import_audio_sink()
 container_loaded = threading.Event()
@@ -31,10 +30,8 @@ def run(self):
         container_loaded.clear()
         try:
             self.cmdloop()
-        except Exception, e:
-            import traceback
-            traceback.print_exc(e)
-        self.do_quit(None)
+        finally:
+            self.do_quit(None)
 
     def do_logout(self, line):
         self.jukebox.session.logout()
@@ -314,13 +311,10 @@ def logged_in(self, session, error):
             print error
             return
         self.session = session
-        try:
-            self.ctr = session.playlist_container()
-            self.container_manager.watch(self.ctr)
-            self.starred = session.starred()
-            self.ui.start()
-        except:
-            traceback.print_exc()
+        self.ctr = session.playlist_container()
+        self.container_manager.watch(self.ctr)
+        self.starred = session.starred()
+        self.ui.start()
 
     def logged_out(self, session):
         self.ui.cmdqueue.append("quit")