pep8 formatting changes
This commit is contained in:
Matt Martz
parent
ef4d483b94
commit
3a2260d6af
|
|
@ -37,8 +37,9 @@ def distance(origin, destination):
|
|||
|
||||
dlat = math.radians(lat2-lat1)
|
||||
dlon = math.radians(lon2-lon1)
|
||||
a = math.sin(dlat/2) * math.sin(dlat/2) + math.cos(math.radians(lat1)) \
|
||||
* math.cos(math.radians(lat2)) * math.sin(dlon/2) * math.sin(dlon/2)
|
||||
a = (math.sin(dlat / 2) * math.sin(dlat / 2) + math.cos(math.radians(lat1))
|
||||
* math.cos(math.radians(lat2)) * math.sin(dlon / 2)
|
||||
* math.sin(dlon / 2))
|
||||
c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a))
|
||||
d = radius * c
|
||||
|
||||
|
|
@ -70,6 +71,7 @@ class FileGetter(threading.Thread):
|
|||
|
||||
def downloadSpeed(files):
|
||||
start = time.time()
|
||||
|
||||
def producer(q, files):
|
||||
for file in files:
|
||||
thread = FileGetter(file, start)
|
||||
|
|
@ -79,6 +81,7 @@ def downloadSpeed(files):
|
|||
sys.stdout.flush()
|
||||
|
||||
finished = []
|
||||
|
||||
def consumer(q, total_files):
|
||||
while len(finished) < total_files:
|
||||
thread = q.get(True)
|
||||
|
|
@ -122,6 +125,7 @@ class FilePutter(threading.Thread):
|
|||
|
||||
def uploadSpeed(url, sizes):
|
||||
start = time.time()
|
||||
|
||||
def producer(q, sizes):
|
||||
for size in sizes:
|
||||
thread = FilePutter(url, start, size)
|
||||
|
|
@ -131,6 +135,7 @@ def uploadSpeed(url, sizes):
|
|||
sys.stdout.flush()
|
||||
|
||||
finished = []
|
||||
|
||||
def consumer(q, total_sizes):
|
||||
while len(finished) < total_sizes:
|
||||
thread = q.get(True)
|
||||
|
|
@ -149,7 +154,9 @@ def uploadSpeed(url, sizes):
|
|||
|
||||
|
||||
def getConfig():
|
||||
"""Download the speedtest.net configuration and return only the data we are interested in"""
|
||||
"""Download the speedtest.net configuration and return only the data
|
||||
we are interested in
|
||||
"""
|
||||
|
||||
uh = urllib.urlopen('http://www.speedtest.net/speedtest-config.php')
|
||||
configxml = uh.read()
|
||||
|
|
@ -161,13 +168,14 @@ def getConfig():
|
|||
'client': root.find('client').attrib,
|
||||
'times': root.find('times').attrib,
|
||||
'download': root.find('download').attrib,
|
||||
'upload': root.find('upload').attrib
|
||||
}
|
||||
'upload': root.find('upload').attrib}
|
||||
return config
|
||||
|
||||
|
||||
def closestServers(client):
|
||||
"""Determine the 5 closest speedtest.net servers based on geographic distance"""
|
||||
"""Determine the 5 closest speedtest.net servers based on geographic
|
||||
distance
|
||||
"""
|
||||
|
||||
uh = urllib.urlopen('http://speedtest.net/speedtest-servers.php')
|
||||
serversxml = uh.read()
|
||||
|
|
@ -177,7 +185,8 @@ def closestServers(client):
|
|||
root = ET.fromstring(serversxml)
|
||||
servers = {}
|
||||
for server in root[0]:
|
||||
d = distance([float(client['lat']), float(client['lon'])], [float(server.get('lat')), float(server.get('lon'))])
|
||||
d = distance([float(client['lat']), float(client['lon'])],
|
||||
[float(server.get('lat')), float(server.get('lon'))])
|
||||
servers[d] = server.attrib
|
||||
|
||||
closest = []
|
||||
|
|
@ -190,7 +199,9 @@ def closestServers(client):
|
|||
|
||||
|
||||
def getBestServer(servers):
|
||||
"""Perform a speedtest.net "ping" to determine which speedtest.net server has the lowest latency"""
|
||||
"""Perform a speedtest.net "ping" to determine which speedtest.net
|
||||
server has the lowest latency
|
||||
"""
|
||||
|
||||
results = {}
|
||||
for server in servers:
|
||||
|
|
@ -232,7 +243,8 @@ def speedtest():
|
|||
urls = []
|
||||
for size in sizes:
|
||||
for i in xrange(0, 4):
|
||||
urls.append('%s/random%sx%s.jpg' % (os.path.dirname(best['url']), size, size))
|
||||
urls.append('%s/random%sx%s.jpg' %
|
||||
(os.path.dirname(best['url']), size, size))
|
||||
print 'Testing download speed',
|
||||
dlspeed = downloadSpeed(urls)
|
||||
print '\nDownload: %s Mbit/s' % round((dlspeed / 1024 / 1024) * 8, 2)
|
||||
|
|
@ -259,10 +271,12 @@ def speedtest():
|
|||
'recommendedserverid=%s' % best['id'],
|
||||
'accuracy=%s' % 1,
|
||||
'serverid=%s' % best['id'],
|
||||
'hash=%s' % hashlib.md5('%s-%s-%s-%s' % (ping, ulspeedk, dlspeedk, '297aae72')).hexdigest()
|
||||
]
|
||||
'hash=%s' % hashlib.md5('%s-%s-%s-%s' %
|
||||
(ping, ulspeedk, dlspeedk, '297aae72')
|
||||
).hexdigest()]
|
||||
|
||||
req = urllib2.Request('http://www.speedtest.net/api/api.php', data='&'.join(apiData))
|
||||
req = urllib2.Request('http://www.speedtest.net/api/api.php',
|
||||
data='&'.join(apiData))
|
||||
req.add_header('Referer', 'http://c.speedtest.net/flash/speedtest.swf')
|
||||
f = urllib2.urlopen(req)
|
||||
response = f.read()
|
||||
|
|
@ -284,4 +298,4 @@ def speedtest():
|
|||
if __name__ == '__main__':
|
||||
speedtest()
|
||||
|
||||
# vim:ts=2:sw=2:expandtab
|
||||
# vim:ts=4:sw=4:expandtab
|
||||
|
|
|
|||
|
|
@ -37,8 +37,9 @@ def distance(origin, destination):
|
|||
|
||||
dlat = math.radians(lat2-lat1)
|
||||
dlon = math.radians(lon2-lon1)
|
||||
a = math.sin(dlat/2) * math.sin(dlat/2) + math.cos(math.radians(lat1)) \
|
||||
* math.cos(math.radians(lat2)) * math.sin(dlon/2) * math.sin(dlon/2)
|
||||
a = (math.sin(dlat / 2) * math.sin(dlat / 2) + math.cos(math.radians(lat1))
|
||||
* math.cos(math.radians(lat2)) * math.sin(dlon / 2)
|
||||
* math.sin(dlon / 2))
|
||||
c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a))
|
||||
d = radius * c
|
||||
|
||||
|
|
@ -70,6 +71,7 @@ class FileGetter(threading.Thread):
|
|||
|
||||
def downloadSpeed(files):
|
||||
start = time.time()
|
||||
|
||||
def producer(q, files):
|
||||
for file in files:
|
||||
thread = FileGetter(file, start)
|
||||
|
|
@ -79,6 +81,7 @@ def downloadSpeed(files):
|
|||
sys.stdout.flush()
|
||||
|
||||
finished = []
|
||||
|
||||
def consumer(q, total_files):
|
||||
while len(finished) < total_files:
|
||||
thread = q.get(True)
|
||||
|
|
@ -93,7 +96,8 @@ def downloadSpeed(files):
|
|||
cons_thread.start()
|
||||
prod_thread.join()
|
||||
cons_thread.join()
|
||||
return (len(b''.join([chunk if isinstance(chunk, bytes) else chunk.encode() for chunk in finished]))/(time.time()-start))
|
||||
return (len(b''.join([chunk if isinstance(chunk, bytes) else chunk.encode()
|
||||
for chunk in finished]))/(time.time()-start))
|
||||
|
||||
|
||||
class FilePutter(threading.Thread):
|
||||
|
|
@ -122,6 +126,7 @@ class FilePutter(threading.Thread):
|
|||
|
||||
def uploadSpeed(url, sizes):
|
||||
start = time.time()
|
||||
|
||||
def producer(q, sizes):
|
||||
for size in sizes:
|
||||
thread = FilePutter(url, start, size)
|
||||
|
|
@ -131,6 +136,7 @@ def uploadSpeed(url, sizes):
|
|||
sys.stdout.flush()
|
||||
|
||||
finished = []
|
||||
|
||||
def consumer(q, total_sizes):
|
||||
while len(finished) < total_sizes:
|
||||
thread = q.get(True)
|
||||
|
|
@ -145,13 +151,17 @@ def uploadSpeed(url, sizes):
|
|||
cons_thread.start()
|
||||
prod_thread.join()
|
||||
cons_thread.join()
|
||||
return (len(b''.join([chunk if isinstance(chunk, bytes) else chunk.encode() for chunk in finished]))/(time.time()-start))
|
||||
return (len(b''.join([chunk if isinstance(chunk, bytes) else chunk.encode()
|
||||
for chunk in finished]))/(time.time()-start))
|
||||
|
||||
|
||||
def getConfig():
|
||||
"""Download the speedtest.net configuration and return only the data we are interested in"""
|
||||
"""Download the speedtest.net configuration and return only the data
|
||||
we are interested in
|
||||
"""
|
||||
|
||||
uh = urllib.request.urlopen('http://www.speedtest.net/speedtest-config.php')
|
||||
uh = urllib.request.urlopen('http://www.speedtest.net/'
|
||||
'speedtest-config.php')
|
||||
configxml = uh.read()
|
||||
if int(uh.getcode()) != 200:
|
||||
return None
|
||||
|
|
@ -161,13 +171,14 @@ def getConfig():
|
|||
'client': root.find('client').attrib,
|
||||
'times': root.find('times').attrib,
|
||||
'download': root.find('download').attrib,
|
||||
'upload': root.find('upload').attrib
|
||||
}
|
||||
'upload': root.find('upload').attrib}
|
||||
return config
|
||||
|
||||
|
||||
def closestServers(client):
|
||||
"""Determine the 5 closest speedtest.net servers based on geographic distance"""
|
||||
"""Determine the 5 closest speedtest.net servers based on geographic
|
||||
distance
|
||||
"""
|
||||
|
||||
uh = urllib.request.urlopen('http://speedtest.net/speedtest-servers.php')
|
||||
serversxml = uh.read()
|
||||
|
|
@ -177,7 +188,8 @@ def closestServers(client):
|
|||
root = ET.fromstring(serversxml)
|
||||
servers = {}
|
||||
for server in root[0]:
|
||||
d = distance([float(client['lat']), float(client['lon'])], [float(server.get('lat')), float(server.get('lon'))])
|
||||
d = distance([float(client['lat']), float(client['lon'])],
|
||||
[float(server.get('lat')), float(server.get('lon'))])
|
||||
servers[d] = server.attrib
|
||||
|
||||
closest = []
|
||||
|
|
@ -190,7 +202,9 @@ def closestServers(client):
|
|||
|
||||
|
||||
def getBestServer(servers):
|
||||
"""Perform a speedtest.net "ping" to determine which speedtest.net server has the lowest latency"""
|
||||
"""Perform a speedtest.net "ping" to determine which speedtest.net
|
||||
server has the lowest latency
|
||||
"""
|
||||
|
||||
results = {}
|
||||
for server in servers:
|
||||
|
|
@ -232,7 +246,8 @@ def speedtest():
|
|||
urls = []
|
||||
for size in sizes:
|
||||
for i in range(0, 4):
|
||||
urls.append('%s/random%sx%s.jpg' % (os.path.dirname(best['url']), size, size))
|
||||
urls.append('%s/random%sx%s.jpg' % (os.path.dirname(best['url']),
|
||||
size, size))
|
||||
print('Testing download speed', end='')
|
||||
dlspeed = downloadSpeed(urls)
|
||||
print('\nDownload: %s Mbit/s' % round((dlspeed / 1024 / 1024) * 8, 2))
|
||||
|
|
@ -259,10 +274,12 @@ def speedtest():
|
|||
'recommendedserverid=%s' % best['id'],
|
||||
'accuracy=%s' % 1,
|
||||
'serverid=%s' % best['id'],
|
||||
'hash=%s' % hashlib.md5(('%s-%s-%s-%s' % (ping, ulspeedk, dlspeedk, '297aae72')).encode()).hexdigest()
|
||||
]
|
||||
'hash=%s' % hashlib.md5(('%s-%s-%s-%s' %
|
||||
(ping, ulspeedk, dlspeedk, '297aae72'))
|
||||
.encode()).hexdigest()]
|
||||
|
||||
req = urllib.request.Request('http://www.speedtest.net/api/api.php', data='&'.join(apiData).encode())
|
||||
req = urllib.request.Request('http://www.speedtest.net/api/api.php',
|
||||
data='&'.join(apiData).encode())
|
||||
req.add_header('Referer', 'http://c.speedtest.net/flash/speedtest.swf')
|
||||
f = urllib.request.urlopen(req)
|
||||
response = f.read()
|
||||
|
|
@ -279,7 +296,8 @@ def speedtest():
|
|||
print('Could not submit results to speedtest.net')
|
||||
sys.exit(1)
|
||||
|
||||
print('Share results: http://www.speedtest.net/result/%s.png' % resultid[0].decode())
|
||||
print('Share results: http://www.speedtest.net/result/%s.png' % resultid[0]
|
||||
.decode())
|
||||
|
||||
if __name__ == '__main__':
|
||||
speedtest()
|
||||
|
|
|
|||
Loading…
Reference in New Issue