From 34ebdaf8de413ead9ea6d2d7ee0bbbddb5c0da64 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Wed, 31 Mar 2010 23:30:27 +0200 Subject: [PATCH] Update frontend to use new SPLC.get() --- mopidy/mpd/frontend.py | 8 ++++---- tests/mpd/frontend_test.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mopidy/mpd/frontend.py b/mopidy/mpd/frontend.py index 5c18f802..97ceb097 100644 --- a/mopidy/mpd/frontend.py +++ b/mopidy/mpd/frontend.py @@ -1343,8 +1343,8 @@ class MpdFrontend(object): """ try: return ['file: %s' % t.uri - for t in self.backend.stored_playlists.get_by_name(name).tracks] - except KeyError as e: + for t in self.backend.stored_playlists.get(name=name).tracks] + except LookupError as e: raise MpdAckError(e[0]) @handle_pattern(r'^listplaylistinfo "(?P[^"]+)"$') @@ -1362,9 +1362,9 @@ class MpdFrontend(object): Album, Artist, Track """ try: - return self.backend.stored_playlists.get_by_name(name).mpd_format( + return self.backend.stored_playlists.get(name=name).mpd_format( search_result=True) - except KeyError as e: + except LookupError as e: raise MpdAckError(e[0]) @handle_pattern(r'^listplaylists$') diff --git a/tests/mpd/frontend_test.py b/tests/mpd/frontend_test.py index ffb6da67..dbc0e511 100644 --- a/tests/mpd/frontend_test.py +++ b/tests/mpd/frontend_test.py @@ -824,7 +824,7 @@ class StoredPlaylistsHandlerTest(unittest.TestCase): def test_listplaylist_fails_if_no_playlist_is_found(self): result = self.h.handle_request(u'listplaylist "name"') - self.assert_(u'ACK Name "name" not found' in result) + self.assert_(u'ACK "name=name" match no playlists' in result) def test_listplaylistinfo(self): self.b.stored_playlists.playlists = [ @@ -837,7 +837,7 @@ class StoredPlaylistsHandlerTest(unittest.TestCase): def test_listplaylistinfo_fails_if_no_playlist_is_found(self): result = self.h.handle_request(u'listplaylistinfo "name"') - self.assert_(u'ACK Name "name" not found' in result) + self.assert_(u'ACK "name=name" match no playlists' in result) def test_listplaylists(self): last_modified = dt.datetime(2001, 3, 17, 13, 41, 17)