Same changes
Made the same changes in speedtest-cli-3 to support Python 3.
This commit is contained in:
parent
76204accc9
commit
4e1c447251
|
@ -193,11 +193,20 @@ def closestServers(client):
|
||||||
for server in root[0]:
|
for server in root[0]:
|
||||||
d = distance([float(client['lat']), float(client['lon'])],
|
d = distance([float(client['lat']), float(client['lon'])],
|
||||||
[float(server.get('lat')), float(server.get('lon'))])
|
[float(server.get('lat')), float(server.get('lon'))])
|
||||||
servers[d] = server.attrib
|
if d not in servers:
|
||||||
|
servers[d] = [server.attrib]
|
||||||
|
else:
|
||||||
|
servers[d].append(server.attrib)
|
||||||
|
|
||||||
closest = []
|
closest = []
|
||||||
for d in sorted(servers.keys())[0:4]:
|
for d in sorted(servers.keys()):
|
||||||
closest.append(servers[d])
|
for s in servers[d]:
|
||||||
|
closest.append(s)
|
||||||
|
if(len(closest) == 5):
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
continue
|
||||||
|
break
|
||||||
|
|
||||||
del servers
|
del servers
|
||||||
del root
|
del root
|
||||||
|
@ -226,8 +235,9 @@ def getBestServer(servers):
|
||||||
avg = round((cum / 3) * 1000000, 3)
|
avg = round((cum / 3) * 1000000, 3)
|
||||||
results[avg] = server
|
results[avg] = server
|
||||||
|
|
||||||
best = results[sorted(results.keys())[0]]
|
fastest = sorted(results.keys())[0]
|
||||||
best['latency'] = avg
|
best = results[fastest]
|
||||||
|
best['latency'] = fastest
|
||||||
|
|
||||||
return best
|
return best
|
||||||
|
|
||||||
|
@ -238,6 +248,9 @@ def speedtest():
|
||||||
print('Retrieving speedtest.net configuration...')
|
print('Retrieving speedtest.net configuration...')
|
||||||
config = getConfig()
|
config = getConfig()
|
||||||
|
|
||||||
|
client = dict(config['client'].items())
|
||||||
|
print('Testing IP: %(ip)s from ISP: %(isp)s' % client)
|
||||||
|
|
||||||
print('Retrieving speedtest.net server list...')
|
print('Retrieving speedtest.net server list...')
|
||||||
servers = closestServers(config['client'])
|
servers = closestServers(config['client'])
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue