andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert mopidy.settings from package to file

Browse Source
This commit is contained in:
Stein Magnus Jodal 2010-03-23 00:53:09 +01:00
parent 9a09692e99
commit bbc44350fc
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mopidy/settings/default.py → mopidy/settings.py
View File

@ -3,12 +3,16 @@ Available settings and their default values.
.. warning::
Do *not* change settings in ``mopidy/settings/default.py``. Instead, add a
file called ``~/.mopidy/settings.py`` and redefine settings there.
Do *not* change settings in ``mopidy/settings.py``. Instead, add a file
called ``~/.mopidy/settings.py`` and redefine settings there.
"""
from __future__ import absolute_import
import os
import sys
from mopidy.utils import get_or_create_dotdir
#: List of playback backends to use. Default::
#:
#: BACKENDS = (u'mopidy.backends.despotify.DespotifyBackend',)
@ -91,3 +95,12 @@ SPOTIFY_USERNAME = u''
#: Your Spotify Premium password. Used by all Spotify backends.
SPOTIFY_PASSWORD = u''
# Import user specific settings
dotdir = get_or_create_dotdir()
settings_file = os.path.join(dotdir, u'settings.py')
if not os.path.isfile(settings_file):
logger.warning(u'Settings not found: %s', settings_file)
else:
sys.path.insert(0, dotdir)
from settings import *

12
mopidy/settings/__init__.py
View File

@ -1,12 +0,0 @@
import os
from mopidy.settings.default import *
from mopidy.utils import get_or_create_dotdir
dotdir = get_or_create_dotdir()
settings_file = os.path.join(dotdir, u'settings.py')
if not os.path.isfile(settings_file):
logger.warning(u'Settings not found: %s', settings_file)
else:
sys.path.insert(0, dotdir)
from settings import *