1
0
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:
softwarefactory-project-zuul[bot] 2019-09-04 16:18:58 +00:00 committed by GitHub
commit 4bcb941df9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -163,8 +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)
if isinstance(v, (list, dict)):
return json.dumps(v)
return v
# calculate the max width of each column