From bcd9fd66e84865058fd626bccfcaad2e6ddfc84a Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Mon, 29 Mar 2010 20:56:29 +0200 Subject: [PATCH] Use index to get KeyError message instead of unicode() as its behaviour varies between Solaris/Py2.6.5 and Ubuntu/Py2.6.4 --- mopidy/mpd/frontend.py | 10 +++++----- tests/mpd/exception_test.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mopidy/mpd/frontend.py b/mopidy/mpd/frontend.py index 6a4cf098..7949f3a2 100644 --- a/mopidy/mpd/frontend.py +++ b/mopidy/mpd/frontend.py @@ -303,7 +303,7 @@ class MpdFrontend(object): track = self.backend.current_playlist.get_by_id(songid) return self.backend.current_playlist.remove(track) except KeyError as e: - raise MpdAckError(unicode(e)) + raise MpdAckError(e[0]) @handle_pattern(r'^clear$') def _current_playlist_clear(self): @@ -410,7 +410,7 @@ class MpdFrontend(object): track = self.backend.current_playlist.get_by_id(songid) return track.mpd_format() except KeyError as e: - raise MpdAckError(unicode(e)) + raise MpdAckError(e[0]) else: return self.backend.current_playlist.playlist.mpd_format() @@ -823,7 +823,7 @@ class MpdFrontend(object): track = self.backend.current_playlist.get_by_id(songid) return self.backend.playback.play(track) except KeyError as e: - raise MpdAckError(unicode(e)) + raise MpdAckError(e[0]) @handle_pattern(r'^play "(?P\d+)"$') def _playback_playpos(self, songpos): @@ -1333,7 +1333,7 @@ class MpdFrontend(object): return ['file: %s' % t.uri for t in self.backend.stored_playlists.get_by_name(name).tracks] except KeyError as e: - raise MpdAckError(unicode(e)) + raise MpdAckError(e[0]) @handle_pattern(r'^listplaylistinfo "(?P[^"]+)"$') def _stored_playlists_listplaylistinfo(self, name): @@ -1353,7 +1353,7 @@ class MpdFrontend(object): return self.backend.stored_playlists.get_by_name(name).mpd_format( search_result=True) except KeyError as e: - raise MpdAckError(unicode(e)) + raise MpdAckError(e[0]) @handle_pattern(r'^listplaylists$') def _stored_playlists_listplaylists(self): diff --git a/tests/mpd/exception_test.py b/tests/mpd/exception_test.py index 07701d0d..029063e8 100644 --- a/tests/mpd/exception_test.py +++ b/tests/mpd/exception_test.py @@ -6,9 +6,9 @@ class MpdExceptionsTest(unittest.TestCase): def test_key_error_wrapped_in_mpd_ack_error(self): try: try: - raise KeyError('Track X not found') + raise KeyError(u'Track X not found') except KeyError as e: - raise MpdAckError(unicode(e)) + raise MpdAckError(e[0]) except MpdAckError as e: self.assertEqual(e.message, u'Track X not found')