Mercurial > hgrepos > Python > libs > ConfigMix
diff configmix/yaml.py @ 21:ce290b10dac5
Better Py2/Py3 compatibility: mark some strings explicitly as Unicode
| author | Franz Glasner <f.glasner@feldmann-mg.com> |
|---|---|
| date | Thu, 10 Mar 2016 13:28:09 +0100 |
| parents | dc058099a4cb |
| children | aa8345dae995 |
line wrap: on
line diff
--- a/configmix/yaml.py Thu Mar 10 13:06:31 2016 +0100 +++ b/configmix/yaml.py Thu Mar 10 13:28:09 2016 +0100 @@ -16,6 +16,8 @@ import yaml import yaml.constructor +from .compat import u + __all__ = ["safe_load", "safe_load_all", "load", "load_all"] @@ -71,14 +73,14 @@ ConfigLoader.add_constructor( - "tag:yaml.org,2002:str", + u("tag:yaml.org,2002:str"), ConfigLoader.construct_yaml_str) if OrderedDict: ConfigLoader.add_constructor( - "tag:yaml.org,2002:map", + u("tag:yaml.org,2002:map"), ConfigLoader.construct_yaml_map) ConfigLoader.add_constructor( - "tag:yaml.org,2002:omap", + u("tag:yaml.org,2002:omap"), ConfigLoader.construct_yaml_map) @@ -133,14 +135,14 @@ ConfigSafeLoader.add_constructor( - "tag:yaml.org,2002:str", + u("tag:yaml.org,2002:str"), ConfigSafeLoader.construct_yaml_str) if OrderedDict: ConfigSafeLoader.add_constructor( - "tag:yaml.org,2002:map", + u("tag:yaml.org,2002:map"), ConfigSafeLoader.construct_yaml_map) ConfigSafeLoader.add_constructor( - "tag:yaml.org,2002:omap", + u("tag:yaml.org,2002:omap"), ConfigSafeLoader.construct_yaml_map)