diff options
author | Zhi Yan Liu <zhiyanl@cn.ibm.com> | 2014-09-28 12:10:11 +0800 |
---|---|---|
committer | Zhi Yan Liu <zhiyanl@cn.ibm.com> | 2014-09-29 13:11:48 +0800 |
commit | 05842041754a0481562a73827ecb89c7b8b66326 (patch) | |
tree | 9713cd93c246f168799eacdd78f8d890fde3391a /glance_store/common | |
parent | f181b61e3633bd75048649ec38f49566093d7bd1 (diff) | |
download | glance_store-05842041754a0481562a73827ecb89c7b8b66326.tar.gz |
Switch to using oslo.utils
This change switched glance_store to using oslo.utils. It is not good to
add dependency on oslo-incubator if we can avoid it.
Change-Id: I9efe3d57e0ce64296c7a75838bd2ee19249f0fa8
Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
Diffstat (limited to 'glance_store/common')
-rw-r--r-- | glance_store/common/utils.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/glance_store/common/utils.py b/glance_store/common/utils.py index d240b86..6c0a2d4 100644 --- a/glance_store/common/utils.py +++ b/glance_store/common/utils.py @@ -25,10 +25,9 @@ try: from eventlet import sleep except ImportError: from time import sleep +from oslo.utils import encodeutils import six -from glance_store.openstack.common import strutils - LOG = logging.getLogger(__name__) @@ -151,4 +150,4 @@ def exception_to_str(exc): except UnicodeError: error = ("Caught '%(exception)s' exception." % {"exception": exc.__class__.__name__}) - return strutils.safe_encode(error, errors='ignore') + return encodeutils.safe_encode(error, errors='ignore') |