openstack/releases
Code Issues Proposed changes

fix format-yaml to work with python 3

Browse Source 
Change-Id: I48717815536a4e31fbac799f7fc7743ff8bc3c4d
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
Doug Hellmann
2017-07-28 16:35:03 -04:00
parent 52bcc89e8f
commit 25ea1d8ecd
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_releases/cmds/reformat_yaml.py
View File

@@ -23,10 +23,10 @@ def main():
args = parser.parse_args() args = parser.parse_args()
for filename in args.file: for filename in args.file:
print("Reformatting %s" % filename) print("Reformatting %s" % filename)
with open(filename, 'rb') as fh: with open(filename, 'r', encoding='utf-8') as fh:
contents = yamlutils.loads(fh.read()) contents = yamlutils.loads(fh.read())
contents = yamlutils.dumps(contents) contents = yamlutils.dumps(contents)
with open(filename, 'wb') as fh: with open(filename, 'w', encoding='utf-8') as fh:
fh.write(contents) fh.write(contents)
if not contents.endswith("\n"): if not contents.endswith("\n"):
fh.write("\n") fh.write("\n")

8
openstack_releases/yamlutils.py
View File

@@ -90,11 +90,13 @@ for str_type in [six.binary_type, six.text_type]:
def dumps(obj): def dumps(obj):
"""Dump a python object -> blob and apply our pretty styling.""" """Dump a python object -> blob and apply our pretty styling."""
buff = six.BytesIO() buff = six.StringIO()
yaml.dump_all([obj], buff, yaml.dump_all([obj], buff,
explicit_start=True, indent=2, explicit_start=True,
indent=2,
default_flow_style=False, default_flow_style=False,
line_break="\n", Dumper=PrettySafeDumper, line_break="\n",
Dumper=PrettySafeDumper,
allow_unicode=True) allow_unicode=True)
return buff.getvalue() return buff.getvalue()