Ticket #5533: issue_5533.patch

File issue_5533.patch, 2.3 KB (added by simenheg, 7 years ago)

  • mediagoblin/init/config.py 

    From 1e70503fef51aa419558ea767f56018642307010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?= <simen@e5r.no>
Date: Sat, 14 Oct 2017 23:46:17 +0200
Subject: [PATCH] Support Unicode characters in configuration values

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`.
---
 mediagoblin/init/config.py                  | 1 +
 mediagoblin/tests/fake_carrot_conf_good.ini | 2 +-
 mediagoblin/tests/test_config.py            | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mediagoblin/init/config.py b/mediagoblin/init/config.py
index a9189e8d..fe469156 100644
    a b def read_mediagoblin_config(config_path, config_spec_path=CONFIG_SPEC_PATH):  
    123123    config = ConfigObj(
    124124        config_path,
    125125        configspec=config_spec,
     126        encoding="UTF8",
    126127        interpolation="ConfigParser")
    127128
    128129    _setup_defaults(config, config_path, mainconfig_defaults)

  • mediagoblin/tests/fake_carrot_conf_good.ini 

    diff --git a/mediagoblin/tests/fake_carrot_conf_good.ini b/mediagoblin/tests/fake_carrot_conf_good.ini
index 1377907b..8dc32525 100644
    a b num_carrots = 88  
    77encouragement_phrase = "I'd love it if you eat your carrots!"
    88
    99# Something extra!
    10 blah_blah = "blah!"
     10blah_blah = "blÊh!"
    1111
    1212[celery]
    1313EAT_CELERY_WITH_CARROTS = False

  • mediagoblin/tests/test_config.py 

    diff --git a/mediagoblin/tests/test_config.py b/mediagoblin/tests/test_config.py
index b13adae6..c3527418 100644
    a b  
     1# -*- coding: utf-8 -*-
     2#
    13# GNU MediaGoblin -- federated, autonomous media hosting
    24# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
    35#
    … … def test_read_mediagoblin_config():  
    4749    assert this_conf['carrotapp']['num_carrots'] == 88
    4850    assert this_conf['carrotapp']['encouragement_phrase'] == \
    4951        "I'd love it if you eat your carrots!"
    50     assert this_conf['carrotapp']['blah_blah'] == "blah!"
     52    assert this_conf['carrotapp']['blah_blah'] == u"blÊh!"
    5153    assert this_conf['celery']['EAT_CELERY_WITH_CARROTS'] == False
    5254
    5355    # A bad file