diff options
| author | Louis Taylor <kragniz@gmail.com> | 2015-01-06 14:32:05 +0000 |
|---|---|---|
| committer | Louis Taylor <kragniz@gmail.com> | 2015-01-27 19:22:42 +0000 |
| commit | b818826420a383e733ec40881ff436595ca57cc8 (patch) | |
| tree | 12222b8c40f9cbdf22ecff0e2a99739cef18576e /glanceclient/common/https.py | |
| parent | 363b17085195e6f38c8b7cf3ac3398f5f3806305 (diff) | |
| download | python-glanceclient-b818826420a383e733ec40881ff436595ca57cc8.tar.gz | |
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
Diffstat (limited to 'glanceclient/common/https.py')
| -rw-r--r-- | glanceclient/common/https.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/glanceclient/common/https.py b/glanceclient/common/https.py index 6baa6af..186b3ac 100644 --- a/glanceclient/common/https.py +++ b/glanceclient/common/https.py @@ -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) |
