mirror of
https://github.com/ansible/awx.git
synced 2024-11-01 08:21:15 +03:00
Merge pull request #4655 from ryanpetrello/cli-py2-u-marker
cli: fix a -f human formatting bug in py2 Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
commit
4bcb941df9
@ -163,8 +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):
|
if isinstance(v, (list, dict)):
|
||||||
return str(v)
|
return json.dumps(v)
|
||||||
return v
|
return v
|
||||||
|
|
||||||
# calculate the max width of each column
|
# calculate the max width of each column
|
||||||
|
Loading…
Reference in New Issue
Block a user