cli: fix a -f human formatting bug in py2

if we encounter non-strings in JSON responses, attempt to represent them
as JSON, instead of stringify-ing them (in py2, stringify-ing adds `u`
markers, which is confusing to users)
This commit is contained in:
Ryan Petrello 2019-09-04 10:33:12 -04:00
parent 66907151a0
commit dbfe85da53
No known key found for this signature in database
GPG Key ID: F2AA5F2122351777

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