From e1f8a0bf72c7d8692148dbe15cb9778a60779c76 Mon Sep 17 00:00:00 2001 From: Johannes Knutsen Date: Fri, 13 Aug 2010 20:48:38 +0200 Subject: [PATCH] Rename mopidy.frontends.mpd.{serializer => translator} to match naming in backends. --- docs/changes.rst | 2 ++ mopidy/backends/base/__init__.py | 2 +- mopidy/backends/base/current_playlist.py | 4 ++-- .../frontends/mpd/{serializer.py => translator.py} | 0 mopidy/models.py | 6 +++--- tests/frontends/mpd/serializer_test.py | 12 ++++++------ 6 files changed, 14 insertions(+), 12 deletions(-) rename mopidy/frontends/mpd/{serializer.py => translator.py} (100%) diff --git a/docs/changes.rst b/docs/changes.rst index 63da4dae..beea0d04 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -32,6 +32,8 @@ Another great release. ``single`` without quotes to work better with BitMPC. - Fixed delete current playing track from playlist, which crashed several clients. + - Rename ``mopidy.frontends.mpd.{serializer => translator}`` to match naming + in backends. - Backend API: diff --git a/mopidy/backends/base/__init__.py b/mopidy/backends/base/__init__.py index e79aceae..7e4d47b4 100644 --- a/mopidy/backends/base/__init__.py +++ b/mopidy/backends/base/__init__.py @@ -8,7 +8,7 @@ from mopidy.backends.base.current_playlist import BaseCurrentPlaylistController from mopidy.backends.base.library import BaseLibraryController from mopidy.backends.base.playback import BasePlaybackController from mopidy.backends.base.stored_playlists import BaseStoredPlaylistsController -from mopidy.frontends.mpd import serializer +from mopidy.frontends.mpd import translator from mopidy.models import Playlist from mopidy.utils import get_class diff --git a/mopidy/backends/base/current_playlist.py b/mopidy/backends/base/current_playlist.py index 1eee8d0c..fc17bbee 100644 --- a/mopidy/backends/base/current_playlist.py +++ b/mopidy/backends/base/current_playlist.py @@ -2,7 +2,7 @@ from copy import copy import logging import random -from mopidy.frontends.mpd import serializer +from mopidy.frontends.mpd import translator logger = logging.getLogger('mopidy.backends.base') @@ -196,4 +196,4 @@ class BaseCurrentPlaylistController(object): def mpd_format(self, *args, **kwargs): """Not a part of the generic backend API.""" kwargs['cpids'] = [ct[0] for ct in self._cp_tracks] - return serializer.tracks_to_mpd_format(self.tracks, *args, **kwargs) + return translator.tracks_to_mpd_format(self.tracks, *args, **kwargs) diff --git a/mopidy/frontends/mpd/serializer.py b/mopidy/frontends/mpd/translator.py similarity index 100% rename from mopidy/frontends/mpd/serializer.py rename to mopidy/frontends/mpd/translator.py diff --git a/mopidy/models.py b/mopidy/models.py index e4281360..c5877657 100644 --- a/mopidy/models.py +++ b/mopidy/models.py @@ -1,6 +1,6 @@ from copy import copy -from mopidy.frontends.mpd import serializer +from mopidy.frontends.mpd import translator class ImmutableObject(object): """ @@ -136,7 +136,7 @@ class Track(ImmutableObject): return list(self._artists) def mpd_format(self, *args, **kwargs): - return serializer.track_to_mpd_format(self, *args, **kwargs) + return translator.track_to_mpd_format(self, *args, **kwargs) class Playlist(ImmutableObject): @@ -177,7 +177,7 @@ class Playlist(ImmutableObject): return len(self._tracks) def mpd_format(self, *args, **kwargs): - return serializer.playlist_to_mpd_format(self, *args, **kwargs) + return translator.playlist_to_mpd_format(self, *args, **kwargs) def with_(self, uri=None, name=None, tracks=None, last_modified=None): """ diff --git a/tests/frontends/mpd/serializer_test.py b/tests/frontends/mpd/serializer_test.py index e2fda8fa..0e0f8183 100644 --- a/tests/frontends/mpd/serializer_test.py +++ b/tests/frontends/mpd/serializer_test.py @@ -1,12 +1,12 @@ import datetime as dt import unittest -from mopidy.frontends.mpd import serializer +from mopidy.frontends.mpd import translator from mopidy.models import Album, Artist, Playlist, Track class TrackMpdFormatTest(unittest.TestCase): def test_mpd_format_for_empty_track(self): - result = serializer.track_to_mpd_format(Track()) + result = translator.track_to_mpd_format(Track()) self.assert_(('file', '') in result) self.assert_(('Time', 0) in result) self.assert_(('Artist', '') in result) @@ -25,7 +25,7 @@ class TrackMpdFormatTest(unittest.TestCase): date=dt.date(1977, 1, 1), length=137000, ) - result = serializer.track_to_mpd_format(track, position=9, cpid=122) + result = translator.track_to_mpd_format(track, position=9, cpid=122) self.assert_(('file', 'a uri') in result) self.assert_(('Time', 137) in result) self.assert_(('Artist', 'an artist') in result) @@ -38,7 +38,7 @@ class TrackMpdFormatTest(unittest.TestCase): def test_mpd_format_artists(self): track = Track(artists=[Artist(name=u'ABBA'), Artist(name=u'Beatles')]) - self.assertEqual(serializer.track_artists_to_mpd_format(track), + self.assertEqual(translator.track_artists_to_mpd_format(track), u'ABBA, Beatles') @@ -46,12 +46,12 @@ class PlaylistMpdFormatTest(unittest.TestCase): def test_mpd_format(self): playlist = Playlist(tracks=[ Track(track_no=1), Track(track_no=2), Track(track_no=3)]) - result = serializer.playlist_to_mpd_format(playlist) + result = translator.playlist_to_mpd_format(playlist) self.assertEqual(len(result), 3) def test_mpd_format_with_range(self): playlist = Playlist(tracks=[ Track(track_no=1), Track(track_no=2), Track(track_no=3)]) - result = serializer.playlist_to_mpd_format(playlist, 1, 2) + result = translator.playlist_to_mpd_format(playlist, 1, 2) self.assertEqual(len(result), 1) self.assertEqual(dict(result[0])['Track'], 2)