Remove openstack.common.strutils

This module now lives in oslo.utils, so import it from there instead.

Co-Authored-By: Ian Cordasco <ian.cordasco@rackspace.com>
Change-Id: Ib35dc840992433542490670781badd9529ec8947
This commit is contained in:
Louis Taylor
2015-01-06 14:32:05 +00:00
parent 363b170851
commit b818826420
14 changed files with 46 additions and 295 deletions
+6 -5
View File
@@ -36,11 +36,12 @@ if not hasattr(parse, 'parse_qsl'):
import cgi
parse.parse_qsl = cgi.parse_qsl
from oslo.utils import encodeutils
from glanceclient.common import https
from glanceclient.common.utils import safe_header
from glanceclient import exc
from glanceclient.openstack.common import importutils
from glanceclient.openstack.common import strutils
osprofiler_web = importutils.try_import("osprofiler.web")
@@ -117,7 +118,7 @@ class HTTPClient(object):
curl.append(url)
msg = ' '.join([strutils.safe_encode(item, errors='ignore')
msg = ' '.join([encodeutils.safe_decode(item, errors='ignore')
for item in curl])
LOG.debug(msg)
@@ -129,9 +130,9 @@ class HTTPClient(object):
dump.extend(['%s: %s' % safe_header(k, v) for k, v in headers])
dump.append('')
if body:
body = strutils.safe_decode(body)
body = encodeutils.safe_decode(body)
dump.extend([body, ''])
LOG.debug('\n'.join([strutils.safe_encode(x, errors='ignore')
LOG.debug('\n'.join([encodeutils.safe_decode(x, errors='ignore')
for x in dump]))
@staticmethod
@@ -145,7 +146,7 @@ class HTTPClient(object):
:returns: Dictionary with encoded headers'
names and values
"""
return dict((strutils.safe_encode(h), strutils.safe_encode(v))
return dict((encodeutils.safe_encode(h), encodeutils.safe_encode(v))
for h, v in six.iteritems(headers))
def _request(self, method, url, **kwargs):