From 74788a2ccb6bade0d22ad5b235f924a3488f58fa Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Mon, 1 Apr 2013 20:14:20 +0200 Subject: [PATCH] Remove the BACKENDS setting --- docs/development.rst | 8 +------- mopidy/settings.py | 19 ------------------- mopidy/utils/settings.py | 2 -- tests/backends/local/playback_test.py | 1 - tests/backends/local/tracklist_test.py | 1 - tests/utils/settings_test.py | 7 ------- 6 files changed, 1 insertion(+), 37 deletions(-) diff --git a/docs/development.rst b/docs/development.rst index 4374acf2..776b004d 100644 --- a/docs/development.rst +++ b/docs/development.rst @@ -281,12 +281,6 @@ settings file in the following way:: import os profile = os.environ.get('PROFILE', '').split(',') - if 'spotify' in profile: - BACKENDS = (u'mopidy.backends.spotify.SpotifyBackend',) - elif 'local' in profile: - BACKENDS = (u'mopidy.backends.local.LocalBackend',) - LOCAL_MUSIC_PATH = u'~/music' - if 'shoutcast' in profile: OUTPUT = u'lame ! shout2send mount="/stream"' elif 'silent' in profile: @@ -296,7 +290,7 @@ settings file in the following way:: SPOTIFY_USERNAME = u'xxxxx' SPOTIFY_PASSWORD = u'xxxxx' -Using this setup you can now run Mopidy with ``PROFILE=silent,spotify mopidy`` +Using this setup you can now run Mopidy with ``PROFILE=silent mopidy`` if you for instance want to test Spotify without any actual audio output. diff --git a/mopidy/settings.py b/mopidy/settings.py index d0d279c2..7df43ae5 100644 --- a/mopidy/settings.py +++ b/mopidy/settings.py @@ -9,25 +9,6 @@ All available settings and their default values. from __future__ import unicode_literals -#: List of playback backends to use. See :ref:`backend-implementations` for all -#: available backends. -#: -#: When results from multiple backends are combined, they are combined in the -#: order the backends are listed here. -#: -#: Default:: -#: -#: BACKENDS = ( -#: u'mopidy.backends.local.LocalBackend', -#: u'mopidy.backends.spotify.SpotifyBackend', -#: u'mopidy.backends.stream.StreamBackend', -#: ) -BACKENDS = ( - 'mopidy.backends.local.LocalBackend', - 'mopidy.backends.spotify.SpotifyBackend', - 'mopidy.backends.stream.StreamBackend', -) - #: The log format used for informational logging. #: #: See http://docs.python.org/2/library/logging.html#formatter-objects for diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py index 8ae61e5b..011b723a 100644 --- a/mopidy/utils/settings.py +++ b/mopidy/utils/settings.py @@ -143,13 +143,11 @@ def validate_settings(defaults, settings): } must_be_iterable = [ - 'BACKENDS', 'FRONTENDS', 'STREAM_PROTOCOLS', ] must_have_value_set = [ - 'BACKENDS', 'FRONTENDS', ] diff --git a/tests/backends/local/playback_test.py b/tests/backends/local/playback_test.py index 834ce8e0..8d997d2e 100644 --- a/tests/backends/local/playback_test.py +++ b/tests/backends/local/playback_test.py @@ -17,7 +17,6 @@ class LocalPlaybackControllerTest(PlaybackControllerTest, unittest.TestCase): Track(uri=generate_song(i), length=4464) for i in range(1, 4)] def setUp(self): - settings.BACKENDS = ('mopidy.backends.local.LocalBackend',) settings.LOCAL_TAG_CACHE_FILE = path_to_data_dir('empty_tag_cache') super(LocalPlaybackControllerTest, self).setUp() diff --git a/tests/backends/local/tracklist_test.py b/tests/backends/local/tracklist_test.py index ec09ac83..0c47a5db 100644 --- a/tests/backends/local/tracklist_test.py +++ b/tests/backends/local/tracklist_test.py @@ -15,7 +15,6 @@ class LocalTracklistControllerTest(TracklistControllerTest, unittest.TestCase): Track(uri=generate_song(i), length=4464) for i in range(1, 4)] def setUp(self): - settings.BACKENDS = ('mopidy.backends.local.LocalBackend',) settings.LOCAL_TAG_CACHE_FILE = path_to_data_dir('empty_tag_cache') super(LocalTracklistControllerTest, self).setUp() diff --git a/tests/utils/settings_test.py b/tests/utils/settings_test.py index 51f0d89c..4e7d9d77 100644 --- a/tests/utils/settings_test.py +++ b/tests/utils/settings_test.py @@ -11,7 +11,6 @@ from tests import unittest class ValidateSettingsTest(unittest.TestCase): def setUp(self): self.defaults = { - 'BACKENDS': ['a'], 'FRONTENDS': ['a'], 'MPD_SERVER_HOSTNAME': '::', 'MPD_SERVER_PORT': 6600, @@ -81,12 +80,6 @@ class ValidateSettingsTest(unittest.TestCase): self.assertEqual( result['FRONTENDS'], 'Must be set.') - def test_empty_backends_list_returns_error(self): - result = setting_utils.validate_settings( - self.defaults, {'BACKENDS': []}) - self.assertEqual( - result['BACKENDS'], 'Must be set.') - def test_noniterable_multivalue_setting_returns_error(self): result = setting_utils.validate_settings( self.defaults, {'FRONTENDS': ('this is not a tuple')})