openstack/python-monascaclient
Code Issues Proposed changes

Fix metric list formatting with Python 3

Browse Source 
Story: 2005269
Task: 30113
Change-Id: Ia12e9b15262eb87594c4724e2c84e003b360b643
This commit is contained in:
Michał Piotrowski
2019-03-21 11:09:22 +01:00
parent a9ce3623e5
commit 52707a31a1
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
monascaclient/common/utils.py
View File

@@ -42,7 +42,8 @@ def arg(*args, **kwargs):
def json_formatter(js): def json_formatter(js):
return (jsonutils.dumps(js, indent=2, ensure_ascii=False)).encode('utf-8') formatter = (jsonutils.dumps(js, indent=2, ensure_ascii=False))
return formatter if six.PY3 else formatter.encode('utf-8')
def print_list(objs, fields, field_labels=None, formatters=None, sortby=None): def print_list(objs, fields, field_labels=None, formatters=None, sortby=None):
@@ -65,10 +66,9 @@ def print_list(objs, fields, field_labels=None, formatters=None, sortby=None):
data = getattr(o, field, None) or '' data = getattr(o, field, None) or ''
row.append(data) row.append(data)
pt.add_row(row) pt.add_row(row)
if sortby is None: field_to_sort_by = field_labels[sortby] if sortby else None
print(pt.get_string().encode('utf-8')) pt_string = pt.get_string(sortby=field_to_sort_by)
else: print(pt_string if six.PY3 else pt_string.encode('utf-8'))
print(pt.get_string(sortby=field_labels[sortby]).encode('utf-8'))
def print_dict(d, formatters=None): def print_dict(d, formatters=None):
@@ -83,7 +83,9 @@ def print_dict(d, formatters=None):
pt.add_row([field, formatters[field](d[field])]) pt.add_row([field, formatters[field](d[field])])
else: else:
pt.add_row([field, d[field]]) pt.add_row([field, d[field]])
print(pt.get_string(sortby='Property').encode('utf-8'))
pt_string = pt.get_string(sortby='Property')
print(pt_string if six.PY3 else pt_string.encode('utf-8'))
def format_parameters(params): def format_parameters(params):