From 67885e83b6076624c7a8870c08f8165bb8677a97 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 2 Nov 2010 23:50:47 +0100 Subject: [PATCH] Rename {Base => }CurrentPlaylistController --- docs/api/backends/controllers.rst | 2 +- mopidy/backends/base/__init__.py | 4 ++-- mopidy/backends/base/current_playlist.py | 2 +- mopidy/backends/base/playback.py | 2 +- mopidy/backends/dummy/__init__.py | 4 ++-- mopidy/backends/libspotify/__init__.py | 4 ++-- mopidy/backends/local/__init__.py | 4 ++-- tests/backends/base/current_playlist.py | 2 +- tests/backends/local/current_playlist_test.py | 5 ++--- 9 files changed, 14 insertions(+), 15 deletions(-) diff --git a/docs/api/backends/controllers.rst b/docs/api/backends/controllers.rst index a9d54504..16ecc9b6 100644 --- a/docs/api/backends/controllers.rst +++ b/docs/api/backends/controllers.rst @@ -40,7 +40,7 @@ Current playlist controller Manages everything related to the currently loaded playlist. -.. autoclass:: mopidy.backends.base.BaseCurrentPlaylistController +.. autoclass:: mopidy.backends.base.CurrentPlaylistController :members: :undoc-members: diff --git a/mopidy/backends/base/__init__.py b/mopidy/backends/base/__init__.py index f4a54984..39ad6e9e 100644 --- a/mopidy/backends/base/__init__.py +++ b/mopidy/backends/base/__init__.py @@ -8,7 +8,7 @@ from mopidy.frontends.mpd import translator from mopidy.models import Playlist from mopidy.utils import get_class -from .current_playlist import BaseCurrentPlaylistController +from .current_playlist import CurrentPlaylistController from .library import BaseLibraryController, BaseLibraryProvider from .playback import BasePlaybackController, BasePlaybackProvider from .stored_playlists import (BaseStoredPlaylistsController, @@ -42,7 +42,7 @@ class BaseBackend(object): core_queue = None #: The current playlist controller. An instance of - #: :class:`mopidy.backends.base.BaseCurrentPlaylistController`. + #: :class:`mopidy.backends.base.CurrentPlaylistController`. current_playlist = None #: The library controller. An instance of diff --git a/mopidy/backends/base/current_playlist.py b/mopidy/backends/base/current_playlist.py index 34a16369..fec8e5a3 100644 --- a/mopidy/backends/base/current_playlist.py +++ b/mopidy/backends/base/current_playlist.py @@ -6,7 +6,7 @@ from mopidy.frontends.mpd import translator logger = logging.getLogger('mopidy.backends.base') -class BaseCurrentPlaylistController(object): +class CurrentPlaylistController(object): """ :param backend: backend the controller is a part of :type backend: :class:`BaseBackend` diff --git a/mopidy/backends/base/playback.py b/mopidy/backends/base/playback.py index 1a47391f..fa848845 100644 --- a/mopidy/backends/base/playback.py +++ b/mopidy/backends/base/playback.py @@ -331,7 +331,7 @@ class BasePlaybackController(object): """ Tell the playback controller that the current playlist has changed. - Used by :class:`mopidy.backends.base.BaseCurrentPlaylistController`. + Used by :class:`mopidy.backends.base.CurrentPlaylistController`. """ self._first_shuffle = True self._shuffled = [] diff --git a/mopidy/backends/dummy/__init__.py b/mopidy/backends/dummy/__init__.py index df4428e3..00f8c9f2 100644 --- a/mopidy/backends/dummy/__init__.py +++ b/mopidy/backends/dummy/__init__.py @@ -1,4 +1,4 @@ -from mopidy.backends.base import (BaseBackend, BaseCurrentPlaylistController, +from mopidy.backends.base import (BaseBackend, CurrentPlaylistController, BasePlaybackController, BasePlaybackProvider, BaseLibraryController, BaseLibraryProvider, BaseStoredPlaylistsController, BaseStoredPlaylistsProvider) @@ -26,7 +26,7 @@ class DummyBackend(BaseBackend): self.core_queue = DummyQueue() - self.current_playlist = BaseCurrentPlaylistController(backend=self) + self.current_playlist = CurrentPlaylistController(backend=self) library_provider = DummyLibraryProvider(backend=self) self.library = BaseLibraryController(backend=self, diff --git a/mopidy/backends/libspotify/__init__.py b/mopidy/backends/libspotify/__init__.py index 0eefcd41..450ac7be 100644 --- a/mopidy/backends/libspotify/__init__.py +++ b/mopidy/backends/libspotify/__init__.py @@ -1,7 +1,7 @@ import logging from mopidy import settings -from mopidy.backends.base import (BaseBackend, BaseCurrentPlaylistController, +from mopidy.backends.base import (BaseBackend, CurrentPlaylistController, BaseLibraryController, BasePlaybackController, BaseStoredPlaylistsController) @@ -41,7 +41,7 @@ class LibspotifyBackend(BaseBackend): super(LibspotifyBackend, self).__init__(*args, **kwargs) - self.current_playlist = BaseCurrentPlaylistController(backend=self) + self.current_playlist = CurrentPlaylistController(backend=self) library_provider = LibspotifyLibraryProvider(backend=self) self.library = BaseLibraryController(backend=self, diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py index a5b6fb7a..0c624687 100644 --- a/mopidy/backends/local/__init__.py +++ b/mopidy/backends/local/__init__.py @@ -5,7 +5,7 @@ import os import shutil from mopidy import settings -from mopidy.backends.base import (BaseBackend, BaseCurrentPlaylistController, +from mopidy.backends.base import (BaseBackend, CurrentPlaylistController, BaseLibraryController, BaseLibraryProvider, BasePlaybackController, BasePlaybackProvider, BaseStoredPlaylistsController, BaseStoredPlaylistsProvider) @@ -32,7 +32,7 @@ class LocalBackend(BaseBackend): def __init__(self, *args, **kwargs): super(LocalBackend, self).__init__(*args, **kwargs) - self.current_playlist = BaseCurrentPlaylistController(backend=self) + self.current_playlist = CurrentPlaylistController(backend=self) library_provider = LocalLibraryProvider(backend=self) self.library = BaseLibraryController(backend=self, diff --git a/tests/backends/base/current_playlist.py b/tests/backends/base/current_playlist.py index 05f08e18..2b6cb84e 100644 --- a/tests/backends/base/current_playlist.py +++ b/tests/backends/base/current_playlist.py @@ -9,7 +9,7 @@ from mopidy.utils import get_class from tests.backends.base import populate_playlist -class BaseCurrentPlaylistControllerTest(object): +class CurrentPlaylistControllerTest(object): tracks = [] def setUp(self): diff --git a/tests/backends/local/current_playlist_test.py b/tests/backends/local/current_playlist_test.py index 3895497a..6f72d7d5 100644 --- a/tests/backends/local/current_playlist_test.py +++ b/tests/backends/local/current_playlist_test.py @@ -10,11 +10,10 @@ from mopidy import settings from mopidy.backends.local import LocalBackend from mopidy.models import Track -from tests.backends.base.current_playlist import \ - BaseCurrentPlaylistControllerTest +from tests.backends.base.current_playlist import CurrentPlaylistControllerTest from tests.backends.local import generate_song -class LocalCurrentPlaylistControllerTest(BaseCurrentPlaylistControllerTest, +class LocalCurrentPlaylistControllerTest(CurrentPlaylistControllerTest, unittest.TestCase): backend_class = LocalBackend