diff options
| author | Cindy Pallares <cindy.pallaresq@gmail.com> | 2015-05-19 19:59:06 -0500 |
|---|---|---|
| committer | Cindy Pallares <cindy.pallaresq@gmail.com> | 2015-06-17 10:56:37 -0500 |
| commit | 997c12d3abfd9a571a4e8f0b022dfb1d27c62edb (patch) | |
| tree | 5ab2346452416876492d076c33dbb1c29db9edc9 /glanceclient/common/https.py | |
| parent | 71d852836474f59f10a7bb9883f6dcecc56e5675 (diff) | |
| download | python-glanceclient-997c12d3abfd9a571a4e8f0b022dfb1d27c62edb.tar.gz | |
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
Diffstat (limited to 'glanceclient/common/https.py')
| -rw-r--r-- | glanceclient/common/https.py | 9 |
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 |