From 120c3812855580dfbdee30091bacaebc1e9643ba Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sat, 11 Jan 2014 15:10:37 +0100
Subject: [PATCH 1/4] stream: Move mopidy.{backends => }.stream

---
 docs/api/backends.rst                    | 2 +-
 docs/changelog.rst                       | 6 +++---
 docs/ext/stream.rst                      | 2 +-
 mopidy/{backends => }/stream/__init__.py | 0
 mopidy/{backends => }/stream/actor.py    | 0
 mopidy/{backends => }/stream/ext.conf    | 0
 setup.py                                 | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename mopidy/{backends => }/stream/__init__.py (100%)
 rename mopidy/{backends => }/stream/actor.py (100%)
 rename mopidy/{backends => }/stream/ext.conf (100%)

diff --git a/docs/api/backends.rst b/docs/api/backends.rst
index ec78f250..2c4ad6a6 100644
--- a/docs/api/backends.rst
+++ b/docs/api/backends.rst
@@ -54,4 +54,4 @@ Backend implementations
 
 * :mod:`mopidy.backends.dummy`
 * :mod:`mopidy.backends.local`
-* :mod:`mopidy.backends.stream`
+* :mod:`mopidy.stream`
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8bd5b15e..97be243b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -708,9 +708,9 @@ throughout Mopidy.
 **Stream backend**
 
 We've added a new backend for playing audio streams, the :mod:`stream backend
-<mopidy.backends.stream>`. It is activated by default. The stream backend
-supports the intersection of what your GStreamer installation supports and what
-protocols are included in the :attr:`mopidy.settings.STREAM_PROTOCOLS` setting.
+<mopidy.stream>`. It is activated by default. The stream backend supports the
+intersection of what your GStreamer installation supports and what protocols
+are included in the :attr:`mopidy.settings.STREAM_PROTOCOLS` setting.
 
 Current limitations:
 
diff --git a/docs/ext/stream.rst b/docs/ext/stream.rst
index 22e7d99e..6c6ab21c 100644
--- a/docs/ext/stream.rst
+++ b/docs/ext/stream.rst
@@ -20,7 +20,7 @@ None. The extension just needs Mopidy.
 Default configuration
 =====================
 
-.. literalinclude:: ../../mopidy/backends/stream/ext.conf
+.. literalinclude:: ../../mopidy/stream/ext.conf
     :language: ini
 
 
diff --git a/mopidy/backends/stream/__init__.py b/mopidy/stream/__init__.py
similarity index 100%
rename from mopidy/backends/stream/__init__.py
rename to mopidy/stream/__init__.py
diff --git a/mopidy/backends/stream/actor.py b/mopidy/stream/actor.py
similarity index 100%
rename from mopidy/backends/stream/actor.py
rename to mopidy/stream/actor.py
diff --git a/mopidy/backends/stream/ext.conf b/mopidy/stream/ext.conf
similarity index 100%
rename from mopidy/backends/stream/ext.conf
rename to mopidy/stream/ext.conf
diff --git a/setup.py b/setup.py
index 607496b7..52a1f2a8 100644
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ setup(
             'http = mopidy.http:Extension [http]',
             'local = mopidy.backends.local:Extension',
             'mpd = mopidy.mpd:Extension',
-            'stream = mopidy.backends.stream:Extension',
+            'stream = mopidy.stream:Extension',
         ],
     },
     classifiers=[

From 2731d2357865590da1b12c3e95116425b249321b Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sat, 11 Jan 2014 15:16:33 +0100
Subject: [PATCH 2/4] 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
 

From d724001f5b692e7ddc28563d0629a0d992d35452 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sat, 11 Jan 2014 15:49:22 +0100
Subject: [PATCH 3/4] tests: Move mopidy.backends.dummy to tests.dummy_backend

---
 tests/core/events_test.py                          |  5 +++--
 mopidy/backends/dummy.py => tests/dummy_backend.py | 10 ----------
 tests/mpd/dispatcher_test.py                       |  5 +++--
 tests/mpd/protocol/__init__.py                     |  5 +++--
 tests/mpd/status_test.py                           |  6 +++---
 tests/utils/jsonrpc_test.py                        |  5 +++--
 6 files changed, 15 insertions(+), 21 deletions(-)
 rename mopidy/backends/dummy.py => tests/dummy_backend.py (96%)

diff --git a/tests/core/events_test.py b/tests/core/events_test.py
index 5d646840..17d2eb84 100644
--- a/tests/core/events_test.py
+++ b/tests/core/events_test.py
@@ -6,14 +6,15 @@ import unittest
 import pykka
 
 from mopidy import core
-from mopidy.backends import dummy
 from mopidy.models import Track
 
+from tests import dummy_backend
+
 
 @mock.patch.object(core.CoreListener, 'send')
 class BackendEventsTest(unittest.TestCase):
     def setUp(self):
-        self.backend = dummy.create_dummy_backend_proxy()
+        self.backend = dummy_backend.create_dummy_backend_proxy()
         self.core = core.Core.start(backends=[self.backend]).proxy()
 
     def tearDown(self):
diff --git a/mopidy/backends/dummy.py b/tests/dummy_backend.py
similarity index 96%
rename from mopidy/backends/dummy.py
rename to tests/dummy_backend.py
index b3be0889..9fdedaa6 100644
--- a/mopidy/backends/dummy.py
+++ b/tests/dummy_backend.py
@@ -2,16 +2,6 @@
 
 This backend implements the backend API in the simplest way possible.  It is
 used in tests of the frontends.
-
-The backend handles URIs starting with ``dummy:``.
-
-**Dependencies**
-
-None
-
-**Default config**
-
-None
 """
 
 from __future__ import unicode_literals
diff --git a/tests/mpd/dispatcher_test.py b/tests/mpd/dispatcher_test.py
index 13f2d7a5..36f2f5e1 100644
--- a/tests/mpd/dispatcher_test.py
+++ b/tests/mpd/dispatcher_test.py
@@ -5,11 +5,12 @@ import unittest
 import pykka
 
 from mopidy import core
-from mopidy.backends import dummy
 from mopidy.mpd.dispatcher import MpdDispatcher
 from mopidy.mpd.exceptions import MpdAckError
 from mopidy.mpd.protocol import request_handlers, handle_request
 
+from tests import dummy_backend
+
 
 class MpdDispatcherTest(unittest.TestCase):
     def setUp(self):
@@ -18,7 +19,7 @@ class MpdDispatcherTest(unittest.TestCase):
                 'password': None,
             }
         }
-        self.backend = dummy.create_dummy_backend_proxy()
+        self.backend = dummy_backend.create_dummy_backend_proxy()
         self.core = core.Core.start(backends=[self.backend]).proxy()
         self.dispatcher = MpdDispatcher(config=config)
 
diff --git a/tests/mpd/protocol/__init__.py b/tests/mpd/protocol/__init__.py
index 9f3b58d6..216afe33 100644
--- a/tests/mpd/protocol/__init__.py
+++ b/tests/mpd/protocol/__init__.py
@@ -6,9 +6,10 @@ import unittest
 import pykka
 
 from mopidy import core
-from mopidy.backends import dummy
 from mopidy.mpd import session
 
+from tests import dummy_backend
+
 
 class MockConnection(mock.Mock):
     def __init__(self, *args, **kwargs):
@@ -31,7 +32,7 @@ class BaseTestCase(unittest.TestCase):
         }
 
     def setUp(self):
-        self.backend = dummy.create_dummy_backend_proxy()
+        self.backend = dummy_backend.create_dummy_backend_proxy()
         self.core = core.Core.start(backends=[self.backend]).proxy()
 
         self.connection = MockConnection()
diff --git a/tests/mpd/status_test.py b/tests/mpd/status_test.py
index dea0c479..5c22be36 100644
--- a/tests/mpd/status_test.py
+++ b/tests/mpd/status_test.py
@@ -5,12 +5,12 @@ import unittest
 import pykka
 
 from mopidy import core
-from mopidy.backends import dummy
 from mopidy.core import PlaybackState
+from mopidy.models import Track
 from mopidy.mpd import dispatcher
 from mopidy.mpd.protocol import status
-from mopidy.models import Track
 
+from tests import dummy_backend
 
 PAUSED = PlaybackState.PAUSED
 PLAYING = PlaybackState.PLAYING
@@ -22,7 +22,7 @@ STOPPED = PlaybackState.STOPPED
 
 class StatusHandlerTest(unittest.TestCase):
     def setUp(self):
-        self.backend = dummy.create_dummy_backend_proxy()
+        self.backend = dummy_backend.create_dummy_backend_proxy()
         self.core = core.Core.start(backends=[self.backend]).proxy()
         self.dispatcher = dispatcher.MpdDispatcher(core=self.core)
         self.context = self.dispatcher.context
diff --git a/tests/utils/jsonrpc_test.py b/tests/utils/jsonrpc_test.py
index c6f516bb..f562f113 100644
--- a/tests/utils/jsonrpc_test.py
+++ b/tests/utils/jsonrpc_test.py
@@ -7,9 +7,10 @@ import unittest
 import pykka
 
 from mopidy import core, models
-from mopidy.backends import dummy
 from mopidy.utils import jsonrpc
 
+from tests import dummy_backend
+
 
 class Calculator(object):
     def model(self):
@@ -40,7 +41,7 @@ class Calculator(object):
 
 class JsonRpcTestBase(unittest.TestCase):
     def setUp(self):
-        self.backend = dummy.create_dummy_backend_proxy()
+        self.backend = dummy_backend.create_dummy_backend_proxy()
         self.core = core.Core.start(backends=[self.backend]).proxy()
 
         self.jrw = jsonrpc.JsonRpcWrapper(

From c962bdffcf4dcc535600afec287090c1bfc4d5f3 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sat, 11 Jan 2014 16:49:34 +0100
Subject: [PATCH 4/4] docs: Remove reference to dummy backend

---
 docs/api/backends.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/api/backends.rst b/docs/api/backends.rst
index ee9ef406..40d65f30 100644
--- a/docs/api/backends.rst
+++ b/docs/api/backends.rst
@@ -52,6 +52,5 @@ Backend listener
 Backend implementations
 =======================
 
-* :mod:`mopidy.backends.dummy`
 * :mod:`mopidy.local`
 * :mod:`mopidy.stream`