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

fix ups for pep8 1.6 changes

This commit is contained in:
Matt Martz 2015-02-26 11:06:42 -06:00
parent cb77da3d37
commit 72da41e4fc
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_cli.py
View File

@ -15,13 +15,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
__version__ = '0.3.2'
# Some global variables we use
user_agent = 'speedtest-cli/%s' % __version__
source = None
shutdown_event = None
import os import os
import re import re
import sys import sys
@ -31,6 +24,13 @@ import socket
import timeit import timeit
import threading import threading
__version__ = '0.3.2'
# Some global variables we use
user_agent = 'speedtest-cli/%s' % __version__
source = None
shutdown_event = None
# Used for bound_interface # Used for bound_interface
socket_socket = socket.socket socket_socket = socket.socket
@ -164,9 +164,10 @@ def distance(origin, destination):
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(lat2)) * math.sin(dlon / 2) math.cos(math.radians(lat1)) *
* math.sin(dlon / 2)) math.cos(math.radians(lat2)) * math.sin(dlon / 2) *
math.sin(dlon / 2))
c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a)) c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a))
d = radius * c d = radius * c