summaryrefslogtreecommitdiff
path: root/glanceclient/common/https.py
diff options
context:
space:
mode:
Diffstat (limited to 'glanceclient/common/https.py')
-rw-r--r--glanceclient/common/https.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/glanceclient/common/https.py b/glanceclient/common/https.py
index 649d14b..30896e0 100644
--- a/glanceclient/common/https.py
+++ b/glanceclient/common/https.py
@@ -47,11 +47,10 @@ try:
else:
raise ImportError
except ImportError:
- try:
- from httplib import HTTPSConnection
- except ImportError:
- from http.client import HTTPSConnection
- from OpenSSL.SSL import Connection as Connection
+ from OpenSSL import SSL
+ from six.moves import http_client
+ HTTPSConnection = http_client.HTTPSConnection
+ Connection = SSL.Connection
from glanceclient import exc