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
+3 -3
View File
@@ -14,6 +14,7 @@
# under the License.
import socket
import ssl
import struct
import OpenSSL
@@ -25,8 +26,8 @@ except ImportError:
from urllib3 import connectionpool
from urllib3 import poolmanager
from oslo.utils import encodeutils
import six
import ssl
from glanceclient.common import utils
@@ -50,7 +51,6 @@ except ImportError:
from glanceclient import exc
from glanceclient.openstack.common import strutils
def to_bytes(s):
@@ -81,7 +81,7 @@ class HTTPSAdapter(adapters.HTTPAdapter):
# NOTE(flaper87): Make sure the url is encoded, otherwise
# python's standard httplib will fail with a TypeError.
url = super(HTTPSAdapter, self).request_url(request, proxies)
return strutils.safe_encode(url)
return encodeutils.safe_encode(url)
def cert_verify(self, conn, url, verify, cert):
super(HTTPSAdapter, self).cert_verify(conn, url, verify, cert)