From 997c12d3abfd9a571a4e8f0b022dfb1d27c62edb Mon Sep 17 00:00:00 2001 From: Cindy Pallares Date: Tue, 19 May 2015 19:59:06 -0500 Subject: Import only modules and update tox.ini As stated in the OpenStack Hacking Guidelines, it is prefered that only modules should be imported. Also updated tox.ini to ignore opestack/common among others. Change-Id: I2f0a603c31052eadee581c11880c0ec6bd392829 --- glanceclient/common/https.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'glanceclient/common/https.py') 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 -- cgit v1.2.1