From e92a7628f25a151f3f83fd0b90da7d590cdc757e Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 7 Apr 2013 00:36:41 +0200
Subject: [PATCH] settings: Remove SettingsProxy at mopidy.settings

---
 mopidy/__init__.py                       | 5 -----
 tests/__init__.py                        | 5 -----
 tests/frontends/mpd/protocol/__init__.py | 3 +--
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/mopidy/__init__.py b/mopidy/__init__.py
index 416f4fbf..fc2b611b 100644
--- a/mopidy/__init__.py
+++ b/mopidy/__init__.py
@@ -24,8 +24,3 @@ warnings.filterwarnings('ignore', 'could not open display')
 
 
 __version__ = '0.13.0'
-
-
-from mopidy import settings as default_settings_module
-from mopidy.utils.settings import SettingsProxy
-settings = SettingsProxy(default_settings_module)
diff --git a/tests/__init__.py b/tests/__init__.py
index 7f7a9c36..b4e1d283 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -8,11 +8,6 @@ if sys.version_info < (2, 7):
 else:
     import unittest  # noqa
 
-from mopidy import settings
-
-# Nuke any local settings to ensure same test env all over
-settings.local.clear()
-
 
 def path_to_data_dir(name):
     path = os.path.dirname(__file__)
diff --git a/tests/frontends/mpd/protocol/__init__.py b/tests/frontends/mpd/protocol/__init__.py
index e62141ee..21ba1c25 100644
--- a/tests/frontends/mpd/protocol/__init__.py
+++ b/tests/frontends/mpd/protocol/__init__.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 import mock
 import pykka
 
-from mopidy import core, settings
+from mopidy import core
 from mopidy.backends import dummy
 from mopidy.frontends.mpd import session
 
@@ -42,7 +42,6 @@ class BaseTestCase(unittest.TestCase):
 
     def tearDown(self):
         pykka.ActorRegistry.stop_all()
-        settings.runtime.clear()
 
     def sendRequest(self, request):
         self.connection.response = []