From bbc44350fc7596857e9d6fcb068617f599113c4e Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Tue, 23 Mar 2010 00:53:09 +0100
Subject: [PATCH] Convert mopidy.settings from package to file

---
 mopidy/{settings/default.py => settings.py} | 17 +++++++++++++++--
 mopidy/settings/__init__.py                 | 12 ------------
 2 files changed, 15 insertions(+), 14 deletions(-)
 rename mopidy/{settings/default.py => settings.py} (82%)
 delete mode 100644 mopidy/settings/__init__.py

diff --git a/mopidy/settings/default.py b/mopidy/settings.py
similarity index 82%
rename from mopidy/settings/default.py
rename to mopidy/settings.py
index 03b831b8..90163c45 100644
--- a/mopidy/settings/default.py
+++ b/mopidy/settings.py
@@ -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 *
diff --git a/mopidy/settings/__init__.py b/mopidy/settings/__init__.py
deleted file mode 100644
index caee252e..00000000
--- a/mopidy/settings/__init__.py
+++ /dev/null
@@ -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 *