From 5fa21d237d6dc09a4fd71a0afa53839a7b1e0dd3 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 23 Feb 2010 00:11:53 +0100 Subject: [PATCH] Get rid of mopidy.config --- mopidy/__init__.py | 16 ++++++++-------- mopidy/__main__.py | 10 +++++----- mopidy/backends/despotify.py | 6 +++--- mopidy/backends/libspotify.py | 4 ++-- mopidy/exceptions.py | 2 +- mopidy/mpd/server.py | 6 +++--- mopidy/settings/default.py | 9 +-------- 7 files changed, 23 insertions(+), 30 deletions(-) diff --git a/mopidy/__init__.py b/mopidy/__init__.py index 2def5cfe..7316ab6f 100644 --- a/mopidy/__init__.py +++ b/mopidy/__init__.py @@ -1,5 +1,5 @@ -from mopidy.exceptions import ConfigError -from mopidy import settings +from mopidy.exceptions import SettingError +from mopidy import settings as original_settings def get_version(): return u'0.1.dev' @@ -7,13 +7,13 @@ def get_version(): def get_mpd_protocol_version(): return u'0.15.0' -class Config(object): +class Settings(object): def __getattr__(self, attr): - if not hasattr(settings, attr): - raise ConfigError(u'Setting "%s" is not set.' % attr) - value = getattr(settings, attr) + if not hasattr(original_settings, attr): + raise SettingError(u'Setting "%s" is not set.' % attr) + value = getattr(original_settings, attr) if type(value) != bool and not value: - raise ConfigError(u'Setting "%s" is empty.' % attr) + raise SettingError(u'Setting "%s" is empty.' % attr) return value -config = Config() +settings = Settings() diff --git a/mopidy/__main__.py b/mopidy/__main__.py index ee1a3384..edc5c808 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -6,15 +6,15 @@ import sys sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../'))) -from mopidy import config -from mopidy.exceptions import ConfigError +from mopidy import settings +from mopidy.exceptions import SettingError from mopidy.mpd.server import MpdServer logger = logging.getLogger('mopidy') def main(): _setup_logging(2) - backend = _get_backend(config.BACKENDS[0]) + backend = _get_backend(settings.BACKENDS[0]) MpdServer(backend=backend) asyncore.loop() @@ -26,7 +26,7 @@ def _setup_logging(verbosity_level): else: level = logging.INFO logging.basicConfig( - format=config.CONSOLE_LOG_FORMAT, + format=settings.CONSOLE_LOG_FORMAT, level=level, ) @@ -44,5 +44,5 @@ if __name__ == '__main__': main() except KeyboardInterrupt: sys.exit('\nInterrupted by user') - except ConfigError, e: + except SettingError, e: sys.exit('%s' % e) diff --git a/mopidy/backends/despotify.py b/mopidy/backends/despotify.py index 062d492e..178699b7 100644 --- a/mopidy/backends/despotify.py +++ b/mopidy/backends/despotify.py @@ -3,7 +3,7 @@ import logging import spytify -from mopidy import config +from mopidy import settings from mopidy.backends import (BaseBackend, BaseCurrentPlaylistController, BaseLibraryController, BasePlaybackController, BaseStoredPlaylistsController) @@ -27,8 +27,8 @@ class DespotifyBackend(BaseBackend): def _connect(self): logger.info(u'Connecting to Spotify') return spytify.Spytify( - config.SPOTIFY_USERNAME.encode(ENCODING), - config.SPOTIFY_PASSWORD.encode(ENCODING)) + settings.SPOTIFY_USERNAME.encode(ENCODING), + settings.SPOTIFY_PASSWORD.encode(ENCODING)) class DespotifyCurrentPlaylistController(BaseCurrentPlaylistController): diff --git a/mopidy/backends/libspotify.py b/mopidy/backends/libspotify.py index dfe40609..4b99c49e 100644 --- a/mopidy/backends/libspotify.py +++ b/mopidy/backends/libspotify.py @@ -6,7 +6,7 @@ from spotify import Link from spotify.manager import SpotifySessionManager from spotify.alsahelper import AlsaController -from mopidy import config +from mopidy import settings from mopidy.backends import (BaseBackend, BaseCurrentPlaylistController, BaseLibraryController, BasePlaybackController, BaseStoredPlaylistsController) @@ -31,7 +31,7 @@ class LibspotifyBackend(BaseBackend): def _connect(self): logger.info(u'Connecting to Spotify') spotify = LibspotifySessionManager( - config.SPOTIFY_USERNAME, config.SPOTIFY_PASSWORD, backend=self) + settings.SPOTIFY_USERNAME, settings.SPOTIFY_PASSWORD, backend=self) spotify.start() return spotify diff --git a/mopidy/exceptions.py b/mopidy/exceptions.py index c6b85845..ac9b9dfe 100644 --- a/mopidy/exceptions.py +++ b/mopidy/exceptions.py @@ -1,4 +1,4 @@ -class ConfigError(Exception): +class SettingError(Exception): pass class MpdAckError(Exception): diff --git a/mopidy/mpd/server.py b/mopidy/mpd/server.py index dff365ec..e0173574 100644 --- a/mopidy/mpd/server.py +++ b/mopidy/mpd/server.py @@ -4,7 +4,7 @@ import socket import sys import time -from mopidy import config +from mopidy import settings from mopidy.mpd.session import MpdSession logger = logging.getLogger(u'mpd.server') @@ -16,11 +16,11 @@ class MpdServer(asyncore.dispatcher): self.backend = backend self.create_socket(socket.AF_INET, socket.SOCK_STREAM) self.set_reuse_addr() - self.bind((config.MPD_SERVER_HOSTNAME, config.MPD_SERVER_PORT)) + self.bind((settings.MPD_SERVER_HOSTNAME, settings.MPD_SERVER_PORT)) self.listen(1) self.started_at = int(time.time()) logger.info(u'Please connect to %s port %s using an MPD client.', - config.MPD_SERVER_HOSTNAME, config.MPD_SERVER_PORT) + settings.MPD_SERVER_HOSTNAME, settings.MPD_SERVER_PORT) def handle_accept(self): (client_socket, client_address) = self.accept() diff --git a/mopidy/settings/default.py b/mopidy/settings/default.py index e07bde02..c027c878 100644 --- a/mopidy/settings/default.py +++ b/mopidy/settings/default.py @@ -1,17 +1,10 @@ """ Available settings and their default values. -.. warning:: To users +.. warning:: Do *not* change settings here. Instead, add a file called ``mopidy/settings/local.py`` and redefine settings there. - -.. note:: To developers - - When you need to read a setting, import :mod:`mopidy.config` instead of - :mod:`mopidy.settings`. This way basic error handling is done for you, and - a :exc:`mopidy.exceptions.ConfigError` exception is raised if a setting is - not set or is empty when used. """ #: List of playback backends to use. Default::