Merge remote branch 'refs/remotes/gullydwarf-cfdv/is315'

[mediagoblin.git] / mediagoblin / config.py

diff --git a/mediagoblin/config.py b/mediagoblin/config.py
index 2e457e44ca49718e5700a8c589e2c13d1d835246..2f93d32ce6343c88d337a51b78a219750591eb69 100644 (file)
--- a/mediagoblin/config.py
+++ b/mediagoblin/config.py
@@ -58,7 +58,7 @@ def read_mediagoblin_config(config_path, config_spec=CONFIG_SPEC_PATH):
     config_path = os.path.abspath(config_path)
 
     config_spec = ConfigObj(
-        CONFIG_SPEC_PATH,
+        config_spec,
         encoding='UTF8', list_values=False, _inspec=True)
 
     _setup_defaults(config_spec, config_path)
@@ -82,7 +82,7 @@ def read_mediagoblin_config(config_path, config_spec=CONFIG_SPEC_PATH):
     return config, validation_result
 
 
-REPORT_HEADER = """\
+REPORT_HEADER = u"""\
 There were validation problems loading this config file:
 --------------------------------------------------------
 """