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

Code formatting fix ups

This commit is contained in:
Matt Martz 2013-10-08 07:09:55 -05:00
parent e6baa69705
commit 7bb9bfc945
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
speedtest_cli.py
View File

@ -123,8 +123,8 @@ def distance(origin, destination):
lat2, lon2 = destination lat2, lon2 = destination
radius = 6371 # km radius = 6371 # km
dlat = math.radians(lat2-lat1) dlat = math.radians(lat2 - lat1)
dlon = math.radians(lon2-lon1) dlon = math.radians(lon2 - lon1)
a = (math.sin(dlat / 2) * math.sin(dlat / 2) + math.cos(math.radians(lat1)) a = (math.sin(dlat / 2) * math.sin(dlat / 2) + math.cos(math.radians(lat1))
* math.cos(math.radians(lat2)) * math.sin(dlon / 2) * math.cos(math.radians(lat2)) * math.sin(dlon / 2)
* math.sin(dlon / 2)) * math.sin(dlon / 2))
@ -187,7 +187,7 @@ def downloadSpeed(files, quiet=False):
prod_thread.join(timeout=0.1) prod_thread.join(timeout=0.1)
while cons_thread.is_alive(): while cons_thread.is_alive():
cons_thread.join(timeout=0.1) cons_thread.join(timeout=0.1)
return (sum(finished)/(time.time()-start)) return (sum(finished) / (time.time() - start))
class FilePutter(threading.Thread): class FilePutter(threading.Thread):
@ -195,7 +195,7 @@ class FilePutter(threading.Thread):
self.url = url self.url = url
chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ' chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'
data = chars * (int(round(int(size) / 36.0))) data = chars * (int(round(int(size) / 36.0)))
self.data = ('content1=%s' % data[0:int(size)-9]).encode() self.data = ('content1=%s' % data[0:int(size) - 9]).encode()
del data del data
self.result = None self.result = None
self.starttime = start self.starttime = start
@ -247,7 +247,7 @@ def uploadSpeed(url, sizes, quiet=False):
prod_thread.join(timeout=0.1) prod_thread.join(timeout=0.1)
while cons_thread.is_alive(): while cons_thread.is_alive():
cons_thread.join(timeout=0.1) cons_thread.join(timeout=0.1)
return (sum(finished)/(time.time()-start)) return (sum(finished) / (time.time() - start))
def getAttributesByTagName(dom, tagName): def getAttributesByTagName(dom, tagName):
@ -544,6 +544,7 @@ def main():
except KeyboardInterrupt: except KeyboardInterrupt:
print_('\nCancelling...') print_('\nCancelling...')
if __name__ == '__main__': if __name__ == '__main__':
main() main()