diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2014-05-05 17:39:40 -0500 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2014-05-05 19:41:23 -0500 |
| commit | b4f346749b3acf4ef8048f5f5078a7dc897d483a (patch) | |
| tree | 62834af87f28f796bee80e7857aa54369f8083bc /keystoneclient/utils.py | |
| parent | 62aca6f0b4351de00a139170fda669d2e1fed094 (diff) | |
| download | python-keystoneclient-b4f346749b3acf4ef8048f5f5078a7dc897d483a.tar.gz | |
Sync with oslo-incubator 2640847
Sync with oslo-incubator commit
2640847e3df7720457103d2111846c27fc8fdcd5 .
First, remove the existing code to cleanup:
$ rm -r keyestoneclient/openstack/*
Then, sync from oslo-incubator:
$ python update.py ../python-keystoneclient
Change-Id: Ic94906002e0257ffc56245e49890e7ee2f3b4a2a
Diffstat (limited to 'keystoneclient/utils.py')
| -rw-r--r-- | keystoneclient/utils.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/keystoneclient/utils.py b/keystoneclient/utils.py index a6c03f5..d0db724 100644 --- a/keystoneclient/utils.py +++ b/keystoneclient/utils.py @@ -61,7 +61,10 @@ def print_list(objs, fields, formatters={}, order_by=None): if order_by is None: order_by = fields[0] - print(strutils.safe_encode(pt.get_string(sortby=order_by))) + encoded = strutils.safe_encode(pt.get_string(sortby=order_by)) + if six.PY3: + encoded = encoded.decode() + print(encoded) def _word_wrap(string, max_length=0): @@ -85,7 +88,10 @@ def print_dict(d, wrap=0): value = '' value = _word_wrap(value, max_length=wrap) pt.add_row([prop, value]) - print(strutils.safe_encode(pt.get_string(sortby='Property'))) + encoded = strutils.safe_encode(pt.get_string(sortby='Property')) + if six.PY3: + encoded = encoded.decode() + print(encoded) def find_resource(manager, name_or_id): |