config: Remove ConfigErrors expception

This commit is contained in:
Thomas Adamcik 2013-04-15 23:09:19 +02:00
parent 992b293174
commit 78d3888dd1
7 changed files with 1 additions and 39 deletions

View File

@ -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)

View File

@ -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.

View File

@ -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

View File

@ -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_'))

View File

@ -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

View File

@ -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

View File

@ -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)