Relocate MPD frontend to 'mopidy.frontends.mpd'

docs/api/mpd.rst

@@ -1,11 +1,11 @@
-*****************
-:mod:`mopidy.mpd`
-*****************
+***************************
+:mod:`mopidy.frontends.mpd`
+***************************
 
 MPD protocol implementation
 ===========================
 
-.. automodule:: mopidy.mpd.frontend
+.. automodule:: mopidy.frontends.mpd.frontend
     :synopsis: Our MPD protocol implementation.
     :members:
     :undoc-members:
@@ -14,9 +14,9 @@ MPD protocol implementation
 MPD server implementation
 =========================
 
-.. automodule:: mopidy.mpd.server
+.. automodule:: mopidy.frontends.mpd.server
     :synopsis: Our MPD server implementation.
     :members:
     :undoc-members:
 
-.. inheritance-diagram:: mopidy.mpd.server
+.. inheritance-diagram:: mopidy.frontends.mpd.server

docs/changes.rst

@@ -17,6 +17,7 @@ Another great release.
   the packages created by ``setup.py`` for i.e. PyPI.
 - MPD frontend:
 
+  - Relocate from :mod:`mopidy.mpd` to :mod:`mopidy.frontends.mpd`.
   - Search improvements, including support for multi-word search.
   - Fixed ``play "-1"`` and ``playid "-1"`` behaviour when playlist is empty.
 

mopidy/backends/__init__.py

@@ -4,8 +4,8 @@ import random
 import time
 
 from mopidy import settings
+from mopidy.frontends.mpd import serializer
 from mopidy.models import Playlist
-from mopidy.mpd import serializer
 from mopidy.utils import get_class
 
 logger = logging.getLogger('mopidy.backends.base')

mopidy/frontends/mpd/frontend.py

@@ -14,11 +14,11 @@ import datetime as dt
 import logging
 import re
 
-from mopidy.mpd import (MpdAckError, MpdArgError, MpdUnknownCommand,
+from mopidy.frontends.mpd import (MpdAckError, MpdArgError, MpdUnknownCommand,
     MpdNoExistError, MpdNotImplemented)
 from mopidy.utils import flatten
 
-logger = logging.getLogger('mopidy.mpd.frontend')
+logger = logging.getLogger('mopidy.frontends.mpd.frontend')
 
 _commands = set()
 _request_handlers = {}

mopidy/frontends/mpd/server.py

@@ -13,7 +13,7 @@ import sys
 from mopidy import get_mpd_protocol_version, settings
 from mopidy.utils import indent, pickle_connection
 
-logger = logging.getLogger('mopidy.mpd.server')
+logger = logging.getLogger('mopidy.frontends.mpd.server')
 
 #: The MPD protocol uses UTF-8 for encoding all data.
 ENCODING = u'utf-8'

mopidy/models.py

@@ -1,6 +1,6 @@
 from copy import copy
 
-from mopidy.mpd import serializer
+from mopidy.frontends.mpd import serializer
 
 class ImmutableObject(object):
     """

mopidy/settings.py

@@ -41,8 +41,8 @@ DUMP_LOG_FILENAME = u'dump.log'
 
 #: Protocol frontend to use. Default::
 #:
-#:     FRONTEND = u'mopidy.mpd.frontend.MpdFrontend'
-FRONTEND = u'mopidy.mpd.frontend.MpdFrontend'
+#:     FRONTEND = u'mopidy.frontends.mpd.frontend.MpdFrontend'
+FRONTEND = u'mopidy.frontends.mpd.frontend.MpdFrontend'
 
 #: Path to folder with local music. Default::
 #:
@@ -107,8 +107,8 @@ MIXER_EXT_SPEAKERS_B = None
 
 #: Server to use. Default::
 #:
-#:     SERVER = u'mopidy.mpd.server.MpdServer'
-SERVER = u'mopidy.mpd.server.MpdServer'
+#:     SERVER = u'mopidy.frontends.mpd.server.MpdServer'
+SERVER = u'mopidy.frontends.mpd.server.MpdServer'
 
 #: Which address Mopidy should bind to. Examples:
 #:

tests/frontends/mpd/audio_output_test.py

@@ -1,8 +1,8 @@
 import unittest
 
 from mopidy.backends.dummy import DummyBackend
+from mopidy.frontends.mpd import frontend
 from mopidy.mixers.dummy import DummyMixer
-from mopidy.mpd import frontend
 
 class AudioOutputHandlerTest(unittest.TestCase):
     def setUp(self):

tests/frontends/mpd/command_list_test.py

@@ -1,8 +1,8 @@
 import unittest
 
 from mopidy.backends.dummy import DummyBackend
+from mopidy.frontends.mpd import frontend
 from mopidy.mixers.dummy import DummyMixer
-from mopidy.mpd import frontend
 
 class CommandListsTest(unittest.TestCase):
     def setUp(self):

tests/frontends/mpd/connection_test.py

@@ -1,8 +1,8 @@
 import unittest
 
 from mopidy.backends.dummy import DummyBackend
+from mopidy.frontends.mpd import frontend
 from mopidy.mixers.dummy import DummyMixer
-from mopidy.mpd import frontend
 
 class ConnectionHandlerTest(unittest.TestCase):
     def setUp(self):

tests/frontends/mpd/current_playlist_test.py

@@ -1,9 +1,9 @@
 import unittest
 
 from mopidy.backends.dummy import DummyBackend
+from mopidy.frontends.mpd import frontend
 from mopidy.mixers.dummy import DummyMixer
 from mopidy.models import Track
-from mopidy.mpd import frontend
 
 class CurrentPlaylistHandlerTest(unittest.TestCase):
     def setUp(self):

tests/frontends/mpd/exception_test.py

@@ -1,6 +1,7 @@
 import unittest
 
-from mopidy.mpd import MpdAckError, MpdUnknownCommand, MpdNotImplemented
+from mopidy.frontends.mpd import (MpdAckError, MpdUnknownCommand,
+    MpdNotImplemented)
 
 class MpdExceptionsTest(unittest.TestCase):
     def test_key_error_wrapped_in_mpd_ack_error(self):

tests/frontends/mpd/music_db_test.py

@@ -1,8 +1,8 @@
 import unittest
 
 from mopidy.backends.dummy import DummyBackend
+from mopidy.frontends.mpd import frontend
 from mopidy.mixers.dummy import DummyMixer
-from mopidy.mpd import frontend
 
 class MusicDatabaseHandlerTest(unittest.TestCase):
     def setUp(self):

tests/frontends/mpd/playback_test.py

@@ -1,9 +1,9 @@
 import unittest
 
 from mopidy.backends.dummy import DummyBackend
+from mopidy.frontends.mpd import frontend
 from mopidy.mixers.dummy import DummyMixer
 from mopidy.models import Track
-from mopidy.mpd import frontend
 
 class PlaybackOptionsHandlerTest(unittest.TestCase):
     def setUp(self):

tests/frontends/mpd/reflection_test.py

@@ -1,8 +1,8 @@
 import unittest
 
 from mopidy.backends.dummy import DummyBackend
+from mopidy.frontends.mpd import frontend
 from mopidy.mixers.dummy import DummyMixer
-from mopidy.mpd import frontend
 
 class ReflectionHandlerTest(unittest.TestCase):
     def setUp(self):

tests/frontends/mpd/request_handler_test.py

@@ -1,8 +1,8 @@
 import unittest
 
 from mopidy.backends.dummy import DummyBackend
+from mopidy.frontends.mpd import frontend, MpdAckError
 from mopidy.mixers.dummy import DummyMixer
-from mopidy.mpd import frontend, MpdAckError
 
 class RequestHandlerTest(unittest.TestCase):
     def setUp(self):

tests/frontends/mpd/serializer_test.py

@@ -1,8 +1,8 @@
 import datetime as dt
 import unittest
 
+from mopidy.frontends.mpd import serializer
 from mopidy.models import Album, Artist, Playlist, Track
-from mopidy.mpd import serializer
 
 class TrackMpdFormatTest(unittest.TestCase):
     def test_mpd_format_for_empty_track(self):

tests/frontends/mpd/server_test.py

@@ -1,6 +1,6 @@
 import unittest
 
-from mopidy.mpd import server
+from mopidy.frontends.mpd import server
 
 class MpdServerTest(unittest.TestCase):
     def setUp(self):

tests/frontends/mpd/status_test.py

@@ -1,9 +1,9 @@
 import unittest
 
 from mopidy.backends.dummy import DummyBackend
+from mopidy.frontends.mpd import frontend
 from mopidy.mixers.dummy import DummyMixer
 from mopidy.models import Track
-from mopidy.mpd import frontend
 
 class StatusHandlerTest(unittest.TestCase):
     def setUp(self):

tests/frontends/mpd/stickers_test.py

@@ -1,8 +1,8 @@
 import unittest
 
 from mopidy.backends.dummy import DummyBackend
+from mopidy.frontends.mpd import frontend
 from mopidy.mixers.dummy import DummyMixer
-from mopidy.mpd import frontend
 
 class StickersHandlerTest(unittest.TestCase):
     def setUp(self):

tests/frontends/mpd/stored_playlists_test.py

@@ -2,9 +2,9 @@ import datetime as dt
 import unittest
 
 from mopidy.backends.dummy import DummyBackend
+from mopidy.frontends.mpd import frontend
 from mopidy.mixers.dummy import DummyMixer
 from mopidy.models import Track, Playlist
-from mopidy.mpd import frontend
 
 from tests import SkipTest