summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-21 15:40:16 +0000
committerGerrit Code Review <review@openstack.org>2015-04-21 15:40:16 +0000
commite176083af3e11bac54881e936af8b98ca9040e03 (patch)
tree98b2e405deb822c7bffc8f61745c3082ae74f7ef
parentcbc1ce5b0aba779236d8fa3b1df9d221c9768360 (diff)
parent8f476f47b1191806b2bbd2e4b570dd1aebfdd630 (diff)
downloadpython-ironicclient-0.6.0.tar.gz
Merge "Encode exception on cli for UnicodeDecodeError"0.6.0
-rw-r--r--ironicclient/shell.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/ironicclient/shell.py b/ironicclient/shell.py
index 2c5855f..8b613f8 100644
--- a/ironicclient/shell.py
+++ b/ironicclient/shell.py
@@ -29,6 +29,8 @@ from keystoneclient.auth.identity import v3 as v3_auth
from keystoneclient import discover
from keystoneclient.openstack.common.apiclient import exceptions as ks_exc
from keystoneclient import session as kssession
+from oslo_utils import encodeutils
+import six
import six.moves.urllib.parse as urlparse
@@ -565,7 +567,7 @@ def main():
print("... terminating ironic client", file=sys.stderr)
sys.exit(130)
except Exception as e:
- print(str(e), file=sys.stderr)
+ print(encodeutils.safe_encode(six.text_type(e)), file=sys.stderr)
sys.exit(1)
if __name__ == "__main__":