Merge pull request #4593 from ryanpetrello/fix-4567

cli: fix a bug when printing complex data structures w/ -f human

Reviewed-by: Elijah DeLee <kdelee@redhat.com>
             https://github.com/kdelee
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-08-26 19:10:56 +00:00 committed by GitHub
commit 7dd6306221
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -140,7 +140,7 @@ def format_human(output, fmt):
lines = []
if fmt == '.':
fmt = 'id,name'
column_names = fmt.split(',')
column_names = [col.strip() for col in fmt.split(',')]
if 'count' in output:
output = output['results']
else:
@ -163,6 +163,8 @@ def format_human(output, fmt):
try:
return locale.format("%.*f", (0, int(v)), True)
except (ValueError, TypeError):
if not isinstance(v, six.text_type):
return str(v)
return v
# calculate the max width of each column