From b1ece22032a0947a09bf24092997acb94ca4c711 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 8 Mar 2010 20:34:57 +0100
Subject: [PATCH] Move mopidy.exceptions.SettingError to mopidy.SettingsError

---
 mopidy/__init__.py   | 14 ++++++++------
 mopidy/__main__.py   |  5 ++---
 mopidy/exceptions.py |  3 ---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/mopidy/__init__.py b/mopidy/__init__.py
index eaea5fd7..176bef6a 100644
--- a/mopidy/__init__.py
+++ b/mopidy/__init__.py
@@ -1,5 +1,4 @@
-from mopidy.exceptions import SettingError
-from mopidy import settings as original_settings
+from mopidy import settings as raw_settings
 
 def get_version():
     return u'0.1.dev'
@@ -7,13 +6,16 @@ def get_version():
 def get_mpd_protocol_version():
     return u'0.16.0'
 
+class SettingsError(Exception):
+    pass
+
 class Settings(object):
     def __getattr__(self, attr):
-        if not hasattr(original_settings, attr):
-            raise SettingError(u'Setting "%s" is not set.' % attr)
-        value = getattr(original_settings, attr)
+        if not hasattr(raw_settings, attr):
+            raise SettingsError(u'Setting "%s" is not set.' % attr)
+        value = getattr(raw_settings, attr)
         if type(value) != bool and not value:
-            raise SettingError(u'Setting "%s" is empty.' % attr)
+            raise SettingsError(u'Setting "%s" is empty.' % attr)
         return value
 
 settings = Settings()
diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index 2fb51f4e..d2cf09a7 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -6,8 +6,7 @@ import sys
 sys.path.insert(0,
     os.path.abspath(os.path.join(os.path.dirname(__file__), '../')))
 
-from mopidy import settings
-from mopidy.exceptions import SettingError
+from mopidy import settings, SettingsError
 from mopidy.mpd.server import MpdServer
 
 logger = logging.getLogger('mopidy')
@@ -44,5 +43,5 @@ if __name__ == '__main__':
         main()
     except KeyboardInterrupt:
         sys.exit('\nInterrupted by user')
-    except SettingError, e:
+    except SettingsError, e:
         sys.exit('%s' % e)
diff --git a/mopidy/exceptions.py b/mopidy/exceptions.py
index ac9b9dfe..8f352807 100644
--- a/mopidy/exceptions.py
+++ b/mopidy/exceptions.py
@@ -1,6 +1,3 @@
-class SettingError(Exception):
-    pass
-
 class MpdAckError(Exception):
     pass