openstack/python-novaclient
Code Issues Proposed changes

Merge "Fixes table when there are multiline in result data"

Browse Source
This commit is contained in:
Jenkins 2015-07-27 16:37:00 +00:00 committed by Gerrit Code Review
commit 9d8633d9f1
1 changed files with 6 additions and 1 deletions

7
novaclient/utils.py

@ -97,6 +97,8 @@ def print_list(objs, fields, formatters={}, sortby_index=None):
data = getattr(o, field_name, '') data = getattr(o, field_name, '')
if data is None: if data is None:
data = '-' data = '-'
# '\r' would break the table, so remove it.
data = str(data).replace("\r", "")
row.append(data) row.append(data)
pt.add_row(row) pt.add_row(row)
@ -163,7 +165,10 @@ def print_dict(d, dict_property="Property", dict_value="Value", wrap=0):
v = textwrap.fill(str(v), wrap) v = textwrap.fill(str(v), wrap)
# if value has a newline, add in multiple rows # if value has a newline, add in multiple rows
# e.g. fault with stacktrace # e.g. fault with stacktrace
if v and isinstance(v, six.string_types) and r'\n' in v: if v and isinstance(v, six.string_types) and (r'\n' in v or '\r' in v):
# '\r' would break the table, so remove it.
if '\r' in v:
v = v.replace('\r', '')
lines = v.strip().split(r'\n') lines = v.strip().split(r'\n')
col1 = k col1 = k
for line in lines: for line in lines: