From 2731d2357865590da1b12c3e95116425b249321b Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 11 Jan 2014 15:16:33 +0100 Subject: [PATCH] local: Move mopidy.{backends => }.local --- docs/api/backends.rst | 2 +- docs/ext/local.rst | 10 +++++----- mopidy/{backends => }/local/__init__.py | 0 mopidy/{backends => }/local/actor.py | 0 mopidy/{backends => }/local/commands.py | 0 mopidy/{backends => }/local/ext.conf | 0 mopidy/{backends => }/local/json.py | 5 ++--- mopidy/{backends => }/local/library.py | 0 mopidy/{backends => }/local/playback.py | 0 mopidy/{backends => }/local/playlists.py | 0 mopidy/{backends => }/local/search.py | 0 mopidy/{backends => }/local/translator.py | 0 setup.py | 2 +- tests/{backends => }/local/__init__.py | 0 tests/{backends => }/local/events_test.py | 4 ++-- tests/{backends => }/local/library_test.py | 2 +- tests/{backends => }/local/playback_test.py | 4 ++-- tests/{backends => }/local/playlists_test.py | 4 ++-- tests/{backends => }/local/tracklist_test.py | 4 ++-- tests/{backends => }/local/translator_test.py | 2 +- 20 files changed, 19 insertions(+), 20 deletions(-) rename mopidy/{backends => }/local/__init__.py (100%) rename mopidy/{backends => }/local/actor.py (100%) rename mopidy/{backends => }/local/commands.py (100%) rename mopidy/{backends => }/local/ext.conf (100%) rename mopidy/{backends => }/local/json.py (96%) rename mopidy/{backends => }/local/library.py (100%) rename mopidy/{backends => }/local/playback.py (100%) rename mopidy/{backends => }/local/playlists.py (100%) rename mopidy/{backends => }/local/search.py (100%) rename mopidy/{backends => }/local/translator.py (100%) rename tests/{backends => }/local/__init__.py (100%) rename tests/{backends => }/local/events_test.py (93%) rename tests/{backends => }/local/library_test.py (99%) rename tests/{backends => }/local/playback_test.py (99%) rename tests/{backends => }/local/playlists_test.py (98%) rename tests/{backends => }/local/tracklist_test.py (99%) rename tests/{backends => }/local/translator_test.py (98%) diff --git a/docs/api/backends.rst b/docs/api/backends.rst index 2c4ad6a6..ee9ef406 100644 --- a/docs/api/backends.rst +++ b/docs/api/backends.rst @@ -53,5 +53,5 @@ Backend implementations ======================= * :mod:`mopidy.backends.dummy` -* :mod:`mopidy.backends.local` +* :mod:`mopidy.local` * :mod:`mopidy.stream` diff --git a/docs/ext/local.rst b/docs/ext/local.rst index aaaeb8e4..c7d6487d 100644 --- a/docs/ext/local.rst +++ b/docs/ext/local.rst @@ -18,7 +18,7 @@ None. The extension just needs Mopidy. Default configuration ===================== -.. literalinclude:: ../../mopidy/backends/local/ext.conf +.. literalinclude:: ../../mopidy/local/ext.conf :language: ini @@ -105,7 +105,7 @@ whatever the current active library is with data. Only one library may be active at a time. To create a new library provider you must create class that implements the -:class:`~mopidy.backends.local.Libary` interface and install it in the -extension registry under ``local:library``. Any data that the library needs -to store on disc should be stored in :confval:`local/data_dir` using the -library name as part of the filename or directory to avoid any conflicts. +:class:`~mopidy.local.Library` interface and install it in the extension +registry under ``local:library``. Any data that the library needs to store on +disc should be stored in :confval:`local/data_dir` using the library name as +part of the filename or directory to avoid any conflicts. diff --git a/mopidy/backends/local/__init__.py b/mopidy/local/__init__.py similarity index 100% rename from mopidy/backends/local/__init__.py rename to mopidy/local/__init__.py diff --git a/mopidy/backends/local/actor.py b/mopidy/local/actor.py similarity index 100% rename from mopidy/backends/local/actor.py rename to mopidy/local/actor.py diff --git a/mopidy/backends/local/commands.py b/mopidy/local/commands.py similarity index 100% rename from mopidy/backends/local/commands.py rename to mopidy/local/commands.py diff --git a/mopidy/backends/local/ext.conf b/mopidy/local/ext.conf similarity index 100% rename from mopidy/backends/local/ext.conf rename to mopidy/local/ext.conf diff --git a/mopidy/backends/local/json.py b/mopidy/local/json.py similarity index 96% rename from mopidy/backends/local/json.py rename to mopidy/local/json.py index 7bccf101..f81d6915 100644 --- a/mopidy/backends/local/json.py +++ b/mopidy/local/json.py @@ -7,9 +7,8 @@ import os import tempfile import mopidy -from mopidy import models -from mopidy.backends import local -from mopidy.backends.local import search +from mopidy import local, models +from mopidy.local import search logger = logging.getLogger(__name__) diff --git a/mopidy/backends/local/library.py b/mopidy/local/library.py similarity index 100% rename from mopidy/backends/local/library.py rename to mopidy/local/library.py diff --git a/mopidy/backends/local/playback.py b/mopidy/local/playback.py similarity index 100% rename from mopidy/backends/local/playback.py rename to mopidy/local/playback.py diff --git a/mopidy/backends/local/playlists.py b/mopidy/local/playlists.py similarity index 100% rename from mopidy/backends/local/playlists.py rename to mopidy/local/playlists.py diff --git a/mopidy/backends/local/search.py b/mopidy/local/search.py similarity index 100% rename from mopidy/backends/local/search.py rename to mopidy/local/search.py diff --git a/mopidy/backends/local/translator.py b/mopidy/local/translator.py similarity index 100% rename from mopidy/backends/local/translator.py rename to mopidy/local/translator.py diff --git a/setup.py b/setup.py index 52a1f2a8..f3e20f4a 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ setup( ], 'mopidy.ext': [ 'http = mopidy.http:Extension [http]', - 'local = mopidy.backends.local:Extension', + 'local = mopidy.local:Extension', 'mpd = mopidy.mpd:Extension', 'stream = mopidy.stream:Extension', ], diff --git a/tests/backends/local/__init__.py b/tests/local/__init__.py similarity index 100% rename from tests/backends/local/__init__.py rename to tests/local/__init__.py diff --git a/tests/backends/local/events_test.py b/tests/local/events_test.py similarity index 93% rename from tests/backends/local/events_test.py rename to tests/local/events_test.py index 967d4cdb..60c0b146 100644 --- a/tests/backends/local/events_test.py +++ b/tests/local/events_test.py @@ -5,9 +5,9 @@ import unittest import mock import pykka -from mopidy import core, audio +from mopidy import audio, core from mopidy.backends import listener -from mopidy.backends.local import actor +from mopidy.local import actor from tests import path_to_data_dir diff --git a/tests/backends/local/library_test.py b/tests/local/library_test.py similarity index 99% rename from tests/backends/local/library_test.py rename to tests/local/library_test.py index b9292f1f..3a0ed090 100644 --- a/tests/backends/local/library_test.py +++ b/tests/local/library_test.py @@ -8,7 +8,7 @@ import unittest import pykka from mopidy import core -from mopidy.backends.local import actor, json +from mopidy.local import actor, json from mopidy.models import Track, Album, Artist from tests import path_to_data_dir diff --git a/tests/backends/local/playback_test.py b/tests/local/playback_test.py similarity index 99% rename from tests/backends/local/playback_test.py rename to tests/local/playback_test.py index 7d48cfea..4aae8b04 100644 --- a/tests/backends/local/playback_test.py +++ b/tests/local/playback_test.py @@ -7,12 +7,12 @@ import unittest import pykka from mopidy import audio, core -from mopidy.backends.local import actor from mopidy.core import PlaybackState +from mopidy.local import actor from mopidy.models import Track from tests import path_to_data_dir -from tests.backends.local import generate_song, populate_tracklist +from tests.local import generate_song, populate_tracklist # TODO Test 'playlist repeat', e.g. repeat=1,single=0 diff --git a/tests/backends/local/playlists_test.py b/tests/local/playlists_test.py similarity index 98% rename from tests/backends/local/playlists_test.py rename to tests/local/playlists_test.py index 38827526..f054ffc9 100644 --- a/tests/backends/local/playlists_test.py +++ b/tests/local/playlists_test.py @@ -8,11 +8,11 @@ import unittest import pykka from mopidy import audio, core -from mopidy.backends.local import actor +from mopidy.local import actor from mopidy.models import Playlist, Track from tests import path_to_data_dir -from tests.backends.local import generate_song +from tests.local import generate_song class LocalPlaylistsProviderTest(unittest.TestCase): diff --git a/tests/backends/local/tracklist_test.py b/tests/local/tracklist_test.py similarity index 99% rename from tests/backends/local/tracklist_test.py rename to tests/local/tracklist_test.py index 28def50c..7717f1a5 100644 --- a/tests/backends/local/tracklist_test.py +++ b/tests/local/tracklist_test.py @@ -6,12 +6,12 @@ import unittest import pykka from mopidy import audio, core -from mopidy.backends.local import actor from mopidy.core import PlaybackState +from mopidy.local import actor from mopidy.models import Playlist, TlTrack, Track from tests import path_to_data_dir -from tests.backends.local import generate_song, populate_tracklist +from tests.local import generate_song, populate_tracklist class LocalTracklistProviderTest(unittest.TestCase): diff --git a/tests/backends/local/translator_test.py b/tests/local/translator_test.py similarity index 98% rename from tests/backends/local/translator_test.py rename to tests/local/translator_test.py index 407a7860..b7ffd5cf 100644 --- a/tests/backends/local/translator_test.py +++ b/tests/local/translator_test.py @@ -6,7 +6,7 @@ import os import tempfile import unittest -from mopidy.backends.local.translator import parse_m3u +from mopidy.local.translator import parse_m3u from mopidy.models import Track from mopidy.utils.path import path_to_uri