walkero
/
speedtest-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Handle HTTPSConnection imports differently, don't bail unless we need it

This commit is contained in:
Matt Martz 2016-03-07 17:02:11 -06:00
parent 1c0a029ca6
commit 95fe038752
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
speedtest.py
View File

@ -81,17 +81,17 @@ except ImportError:
from urllib.request import urlopen, Request, HTTPError, URLError from urllib.request import urlopen, Request, HTTPError, URLError
try: try:
from httplib import HTTPConnection, HTTPSConnection from httplib import HTTPConnection
except ImportError:
from http.client import HTTPConnection
try:
from httplib import HTTPSConnection
except ImportError: except ImportError:
e_http_py2 = sys.exc_info()
try: try:
from http.client import HTTPConnection, HTTPSConnection from http.client import HTTPSConnection
except ImportError: except ImportError:
e_http_py3 = sys.exc_info() HTTPSConnection = None
raise SystemExit('Your python installation is missing required HTTP '
'client classes:\n\n'
'Python 2: %s\n'
'Python 3: %s' % (e_http_py2[1], e_http_py3[1]))
try: try:
from Queue import Queue from Queue import Queue
@ -1148,12 +1148,13 @@ def validate_optional_args(args):
with an error stating which module is missing. with an error stating which module is missing.
""" """
optional_args = { optional_args = {
'json': ('json/simplejson', json), 'json': ('json/simplejson python module', json),
'secure': ('SSL support', HTTPSConnection),
} }
for arg, info in optional_args.items(): for arg, info in optional_args.items():
if getattr(args, arg, False) and info[1] is None: if getattr(args, arg, False) and info[1] is None:
raise SystemExit('%s python module is not installed. --%s is ' raise SystemExit('%s is not installed. --%s is '
'unavailable' % (info[0], arg)) 'unavailable' % (info[0], arg))