From e98ca4c94caebb6b46611f7f6c5d38f2bc30f096 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sat, 13 Apr 2013 01:35:55 +0200 Subject: [PATCH] config: Handle encoding and other minor refactoring mistakes --- mopidy/config/__init__.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/mopidy/config/__init__.py b/mopidy/config/__init__.py index 38db4c42..cca217c3 100644 --- a/mopidy/config/__init__.py +++ b/mopidy/config/__init__.py @@ -59,7 +59,7 @@ def load(files, overrides, extensions=None): defaults = [default_config] if extensions: defaults.extend(e.get_default_config() for e in extensions) - return _load(files, defaults, extensions) + return _load(files, defaults, overrides) # TODO: replace load() with this version of API. @@ -70,8 +70,8 @@ def _load(files, defaults, overrides): sources = ['builtin-defaults'] + files + ['command-line'] logger.info('Loading config from: %s', ', '.join(sources)) - for default in defaults: - parser.readfp(io.StringIO(default)) + for default in defaults: # TODO: remove decoding + parser.readfp(io.StringIO(default.decode('utf-8'))) # Load config from a series of config files for filename in files: @@ -109,10 +109,8 @@ def validate(raw_config, schemas, extensions=None): if errors: # TODO: raise error instead. #raise exceptions.ConfigError(errors) - for name, error in errors.items(): - logger.error('[%s] config errors:', name) - for key in error: - logger.error('%s %s', key, error[key]) + for error in errors: + logger.error(error) sys.exit(1) return config