heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support Unicode characters in configuration values

Browse Source 
Prior to this commit, using a Unicode character in a configuration
string would result in a `UnicodeDecodeError` being raised. Supporting
Unicode characters is especially useful in user-facing configuration
strings, such as `html_title`.
This commit is contained in:
Simen Heggestøyl 2017-10-14 23:46:17 +02:00 committed by Boris Bobrov
parent ceab88e3bd
commit 3eadd6705e
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mediagoblin/init/config.py
View File

@ -123,6 +123,7 @@ def read_mediagoblin_config(config_path, config_spec_path=CONFIG_SPEC_PATH):
config = ConfigObj( config = ConfigObj(
config_path, config_path,
configspec=config_spec, configspec=config_spec,
encoding="UTF8",
interpolation="ConfigParser") interpolation="ConfigParser")
_setup_defaults(config, config_path, mainconfig_defaults) _setup_defaults(config, config_path, mainconfig_defaults)

2
mediagoblin/tests/fake_carrot_conf_good.ini
View File

@ -7,7 +7,7 @@ num_carrots = 88
encouragement_phrase = "I'd love it if you eat your carrots!" encouragement_phrase = "I'd love it if you eat your carrots!"
# Something extra! # Something extra!
blah_blah = "blah!" blah_blah = "blæh!"
[celery] [celery]
EAT_CELERY_WITH_CARROTS = False EAT_CELERY_WITH_CARROTS = False

4
mediagoblin/tests/test_config.py
View File

@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-
#
# GNU MediaGoblin -- federated, autonomous media hosting # GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. # Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
# #
@ -47,7 +49,7 @@ def test_read_mediagoblin_config():
assert this_conf['carrotapp']['num_carrots'] == 88 assert this_conf['carrotapp']['num_carrots'] == 88
assert this_conf['carrotapp']['encouragement_phrase'] == \ assert this_conf['carrotapp']['encouragement_phrase'] == \
"I'd love it if you eat your carrots!" "I'd love it if you eat your carrots!"
assert this_conf['carrotapp']['blah_blah'] == "blah!" assert this_conf['carrotapp']['blah_blah'] == u"blæh!"
assert this_conf['celery']['EAT_CELERY_WITH_CARROTS'] == False assert this_conf['celery']['EAT_CELERY_WITH_CARROTS'] == False
# A bad file # A bad file