summaryrefslogtreecommitdiff
path: root/cinderclient/utils.py
diff options
context:
space:
mode:
authorEric Harney <eharney@redhat.com>2015-11-23 10:40:05 -0500
committerEric Harney <eharney@redhat.com>2015-11-23 10:44:12 -0500
commit6fe9f206631e59f2b2740f83005e19b8b487b480 (patch)
tree152ef5f3ef923c1271c83495584a57ea221a8212 /cinderclient/utils.py
parente2a64f361dd02b9e171b77b08a1dc7c54c290963 (diff)
downloadpython-cinderclient-6fe9f206631e59f2b2740f83005e19b8b487b480.tar.gz
Use oslo_utils encodeutils and strutils
With oslo-incubator being deprecated, move our use of strutils to oslo_utils. This leaves in place the use of oslo-incubator's strutils by other oslo-incubator modules for now. Change-Id: Ic4e50060b42aeca9d1e54424a8a3a123140fbf2a
Diffstat (limited to 'cinderclient/utils.py')
-rw-r--r--cinderclient/utils.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cinderclient/utils.py b/cinderclient/utils.py
index 9941bbf..24ea134 100644
--- a/cinderclient/utils.py
+++ b/cinderclient/utils.py
@@ -24,7 +24,7 @@ import six
import prettytable
from cinderclient import exceptions
-from cinderclient.openstack.common import strutils
+from oslo_utils import encodeutils
def arg(*args, **kwargs):
@@ -107,7 +107,7 @@ def _print(pt, order):
if sys.version_info >= (3, 0):
print(pt.get_string(sortby=order))
else:
- print(strutils.safe_encode(pt.get_string(sortby=order)))
+ print(encodeutils.safe_encode(pt.get_string(sortby=order)))
def print_list(objs, fields, exclude_unavailable=False, formatters=None,
@@ -198,7 +198,7 @@ def find_resource(manager, name_or_id):
pass
if sys.version_info <= (3, 0):
- name_or_id = strutils.safe_decode(name_or_id)
+ name_or_id = encodeutils.safe_decode(name_or_id)
try:
try: