openstack
/
oslo.config
Code Issues Proposed changes

Merge "config-generator yaml format doesn't work with i18n fields"

This commit is contained in:
Zuul 2021-06-02 17:36:45 +00:00 committed by Gerrit Code Review
parent 2e7b39e443 e5fc313ecf
commit 1a7bd66a71
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oslo_config/generator.py
View File

@ -52,6 +52,7 @@ except ImportError:
import yaml
from oslo_config import cfg
from oslo_i18n import _message
import stevedore.named # noqa
LOG = logging.getLogger(__name__)
@ -723,6 +724,18 @@ def _generate_machine_readable_data(groups, conf):
return output_data
def i18n_representer(dumper, data):
"""oslo_i18n yaml representer
Returns a translated to the default locale string for yaml.safe_dump
:param dumper: a SafeDumper instance passed by yaml.safe_dump
:param data: a oslo_i18n._message.Message instance
"""
serializedData = str(data.translation())
return dumper.represent_str(serializedData)
def _output_machine_readable(groups, output_file, conf):
"""Write a machine readable sample config file
@ -736,6 +749,7 @@ def _output_machine_readable(groups, output_file, conf):
"""
output_data = _generate_machine_readable_data(groups, conf)
if conf.format_ == 'yaml':
yaml.SafeDumper.add_representer(_message.Message, i18n_representer)
output_file.write(yaml.safe_dump(output_data,
default_flow_style=False))
else: