diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-10 01:02:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-10 01:02:23 +0000 |
| commit | d178d641c09e0223e308ca78184bcee729fdec13 (patch) | |
| tree | 44b983f99648d44f84e6eddff6f1d5f7eeecd6e0 /glance_store/common | |
| parent | 5277c93e002047d55c521408ee31da1d03825263 (diff) | |
| parent | 22ace8fd78738a33b2e08c47ab37384b90e43de2 (diff) | |
| download | glance_store-d178d641c09e0223e308ca78184bcee729fdec13.tar.gz | |
Merge "Port exception_to_str() to Python 3"
Diffstat (limited to 'glance_store/common')
| -rw-r--r-- | glance_store/common/utils.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/glance_store/common/utils.py b/glance_store/common/utils.py index 088cef6..d9d64af 100644 --- a/glance_store/common/utils.py +++ b/glance_store/common/utils.py @@ -150,4 +150,6 @@ def exception_to_str(exc): except UnicodeError: error = ("Caught '%(exception)s' exception." % {"exception": exc.__class__.__name__}) - return encodeutils.safe_encode(error, errors='ignore') + if six.PY2: + error = encodeutils.safe_encode(error, errors='ignore') + return error |