local: Move mopidy.{backends => }.local

docs/api/backends.rst

@@ -53,5 +53,5 @@ Backend implementations
 =======================
 
 * :mod:`mopidy.backends.dummy`
-* :mod:`mopidy.backends.local`
+* :mod:`mopidy.local`
 * :mod:`mopidy.stream`

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.

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__)
 

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',
         ],

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
 

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

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

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):

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):

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