Remove Playlist.mpd_format() and its usage

mopidy/frontends/mpd/protocol/music_db.py

@@ -1,8 +1,9 @@
 import re
 import shlex
 
-from mopidy.frontends.mpd.protocol import handle_request, stored_playlists
 from mopidy.frontends.mpd.exceptions import MpdArgError, MpdNotImplemented
+from mopidy.frontends.mpd.protocol import handle_request, stored_playlists
+from mopidy.frontends.mpd.translator import playlist_to_mpd_format
 
 def _build_query(mpd_query):
     """
@@ -68,7 +69,8 @@ def find(context, mpd_query):
     - also uses the search type "date".
     """
     query = _build_query(mpd_query)
-    return context.backend.library.find_exact(**query).get().mpd_format()
+    return playlist_to_mpd_format(
+        context.backend.library.find_exact(**query).get())
 
 @handle_request(r'^findadd '
      r'(?P<query>("?([Aa]lbum|[Aa]rtist|[Ff]ilename|[Tt]itle|[Aa]ny)"? '
@@ -324,7 +326,8 @@ def search(context, mpd_query):
     - also uses the search type "date".
     """
     query = _build_query(mpd_query)
-    return context.backend.library.search(**query).get().mpd_format()
+    return playlist_to_mpd_format(
+        context.backend.library.search(**query).get())
 
 @handle_request(r'^update( "(?P<uri>[^"]+)")*$')
 def update(context, uri=None, rescan_unmodified_files=False):

mopidy/frontends/mpd/protocol/stored_playlists.py

@@ -1,7 +1,8 @@
 import datetime as dt
 
-from mopidy.frontends.mpd.protocol import handle_request
 from mopidy.frontends.mpd.exceptions import MpdNoExistError, MpdNotImplemented
+from mopidy.frontends.mpd.protocol import handle_request
+from mopidy.frontends.mpd.translator import playlist_to_mpd_format
 
 @handle_request(r'^listplaylist "(?P<name>[^"]+)"$')
 def listplaylist(context, name):
@@ -40,7 +41,7 @@ def listplaylistinfo(context, name):
     """
     try:
         playlist = context.backend.stored_playlists.get(name=name).get()
-        return playlist.mpd_format()
+        return playlist_to_mpd_format(playlist)
     except LookupError:
         raise MpdNoExistError(
             u'No such playlist', command=u'listplaylistinfo')

mopidy/models.py

@@ -220,7 +220,3 @@ class Playlist(ImmutableObject):
     def length(self):
         """The number of tracks in the playlist. Read-only."""
         return len(self.tracks)
-
-    def mpd_format(self, *args, **kwargs):
-        from mopidy.frontends.mpd import translator
-        return translator.playlist_to_mpd_format(self, *args, **kwargs)