Revert "Use oslo.utils"

This reverts commit 68c2fad55a71ca511ff959e589aa0a3f3dbd4b78.

Looks like this broke the stable branches. :(

Change-Id: I9d190e211ecfa80d573a6c48c0b485f3506fe947
Closes-Bug: #1357652

1 files changed, 3 insertions, 3 deletions

diff --git a/keystoneclient/utils.py b/keystoneclient/utils.py
index 436b2f6..d3342f4 100644
--- a/keystoneclient/utils.py
+++ b/keystoneclient/utils.py
@@ -17,11 +17,11 @@ import inspect
 import logging
 import sys
 
-from oslo.utils import encodeutils
 import prettytable
 import six
 
 from keystoneclient import exceptions
+from keystoneclient.openstack.common import strutils
 
 
 logger = logging.getLogger(__name__)
@@ -61,7 +61,7 @@ def print_list(objs, fields, formatters={}, order_by=None):
 
     if order_by is None:
         order_by = fields[0]
-    encoded = encodeutils.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)
@@ -88,7 +88,7 @@ def print_dict(d, wrap=0):
             value = ''
         value = _word_wrap(value, max_length=wrap)
         pt.add_row([prop, value])
-    encoded = encodeutils.safe_encode(pt.get_string(sortby='Property'))
+    encoded = strutils.safe_encode(pt.get_string(sortby='Property'))
     if six.PY3:
         encoded = encoded.decode()
     print(encoded)