From b818826420a383e733ec40881ff436595ca57cc8 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Tue, 6 Jan 2015 14:32:05 +0000 Subject: Remove openstack.common.strutils This module now lives in oslo.utils, so import it from there instead. Co-Authored-By: Ian Cordasco Change-Id: Ib35dc840992433542490670781badd9529ec8947 --- glanceclient/common/https.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'glanceclient/common/https.py') 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) -- cgit v1.2.1