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

Merge 2e3e6cd821 into 795bc51da4

This commit is contained in:
Chester Balingit 2015-01-15 19:53:51 +00:00
parent 795bc51da4 2e3e6cd821
commit 20ad2145a5
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
speedtest_cli.py
View File

@ -48,6 +48,11 @@ try:
except ImportError:
from urllib.request import urlopen, Request, HTTPError, URLError
try:
from urllib2 import getproxies
except ImportError:
from urllib import getproxies
try:
from httplib import HTTPConnection, HTTPSConnection
except ImportError:
@ -404,12 +409,25 @@ def getBestServer(servers):
urlparts = urlparse(url)
for i in range(0, 3):
try:
if urlparts[0] == 'https':
proxy_set = getproxies()
if proxy_set:
if 'http' in proxy_set:
proxy_path = urlparse(proxy_set['http'])
h = HTTPConnection(proxy_path[1] or proxy_path[2])
elif 'https' in proxy_set:
proxy_path = urlparse(proxy_set['https'])
h = HTTPSConnection(proxy_path[1] or proxy_path[2])
request_url = proxy_path.scheme + "://" + urlparts[1] + urlparts[2]
elif urlparts[0] == 'https':
h = HTTPSConnection(urlparts[1])
request_url = urlparts[2]
else:
h = HTTPConnection(urlparts[1])
request_url = urlparts[2]
start = timeit.default_timer()
h.request("GET", urlparts[2])
h.request("GET", request_url)
r = h.getresponse()
total = (timeit.default_timer() - start)
except (HTTPError, URLError, socket.error):