External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 23:07:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4593 from ryanpetrello/fix-4567

Browse Source 
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
parent fbf19de993 1d2edc1d81
commit 7dd6306221
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awxkit/awxkit/cli/format.py
View File

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