From 78d3888dd1489d58ade0d8c256bcd35f0a0bec19 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <thomas@adamcik.no>
Date: Mon, 15 Apr 2013 23:09:19 +0200
Subject: [PATCH] config: Remove ConfigErrors expception

---
 mopidy/config/__init__.py    |  2 --
 mopidy/config/schemas.py     |  2 --
 mopidy/exceptions.py         | 18 ------------------
 mopidy/utils/process.py      |  4 ----
 tests/config/config_test.py  |  2 +-
 tests/config/schemas_test.py |  1 -
 tests/exceptions_test.py     | 11 -----------
 7 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/mopidy/config/__init__.py b/mopidy/config/__init__.py
index 3a96b556..2e135ceb 100644
--- a/mopidy/config/__init__.py
+++ b/mopidy/config/__init__.py
@@ -94,8 +94,6 @@ def validate(raw_config, schemas, extensions=None):
     config, errors = _validate(raw_config, schemas + extension_schemas)
 
     if errors:
-        # TODO: raise error instead.
-        #raise exceptions.ConfigError(errors)
         for section in errors:
             for key, error in errors[section].items():
                 logger.error('Config value %s/%s %s', section, key, error)
diff --git a/mopidy/config/schemas.py b/mopidy/config/schemas.py
index 90d966d3..1a0c083d 100644
--- a/mopidy/config/schemas.py
+++ b/mopidy/config/schemas.py
@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-from mopidy import exceptions
 from mopidy.config import types
 
 
@@ -101,7 +100,6 @@ class ConfigSchema(object):
         return '\n'.join(lines)
 
 
-
 class ExtensionConfigSchema(ConfigSchema):
     """Sub-classed :class:`ConfigSchema` for use in extensions.
 
diff --git a/mopidy/exceptions.py b/mopidy/exceptions.py
index 702eab9f..2c53e3e4 100644
--- a/mopidy/exceptions.py
+++ b/mopidy/exceptions.py
@@ -16,23 +16,5 @@ class MopidyException(Exception):
         self._message = message
 
 
-class ConfigError(MopidyException):
-    def __init__(self, errors):
-        self._errors = errors
-
-    def __getitem__(self, key):
-        return self._errors[key]
-
-    def __iter__(self):
-        return self._errors.iterkeys()
-
-    @property
-    def message(self):
-        lines = []
-        for key, msg in self._errors.items():
-            lines.append('%s: %s' % (key, msg))
-        return '\n'.join(lines)
-
-
 class ExtensionError(MopidyException):
     pass
diff --git a/mopidy/utils/process.py b/mopidy/utils/process.py
index 24a2e773..c8e3e558 100644
--- a/mopidy/utils/process.py
+++ b/mopidy/utils/process.py
@@ -8,12 +8,8 @@ import threading
 from pykka import ActorDeadError
 from pykka.registry import ActorRegistry
 
-from mopidy import exceptions
-
-
 logger = logging.getLogger('mopidy.utils.process')
 
-
 SIGNALS = dict(
     (k, v) for v, k in signal.__dict__.iteritems()
     if v.startswith('SIG') and not v.startswith('SIG_'))
diff --git a/tests/config/config_test.py b/tests/config/config_test.py
index b112de1f..05b573ec 100644
--- a/tests/config/config_test.py
+++ b/tests/config/config_test.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 import mock
 
-from mopidy import config, exceptions
+from mopidy import config
 
 from tests import unittest, path_to_data_dir
 
diff --git a/tests/config/schemas_test.py b/tests/config/schemas_test.py
index f8d908f7..7f4dae4b 100644
--- a/tests/config/schemas_test.py
+++ b/tests/config/schemas_test.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 import logging
 import mock
 
-from mopidy import exceptions
 from mopidy.config import schemas, types
 
 from tests import unittest
diff --git a/tests/exceptions_test.py b/tests/exceptions_test.py
index daf51a0d..5c244872 100644
--- a/tests/exceptions_test.py
+++ b/tests/exceptions_test.py
@@ -15,14 +15,3 @@ class ExceptionsTest(unittest.TestCase):
     def test_extension_error_is_a_mopidy_exception(self):
         self.assert_(issubclass(
             exceptions.ExtensionError, exceptions.MopidyException))
-
-    def test_config_error_is_a_mopidy_exception(self):
-        self.assert_(issubclass(
-            exceptions.ConfigError, exceptions.MopidyException))
-
-    def test_config_error_provides_getitem(self):
-        exception = exceptions.ConfigError(
-            {'field1': 'msg1', 'field2': 'msg2'})
-        self.assertEqual('msg1', exception['field1'])
-        self.assertEqual('msg2', exception['field2'])
-        self.assertItemsEqual(['field1', 'field2'], exception)