From 79aeabe4e7fd92a02f2c6b47581688c57896bc9e Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Mon, 4 Nov 2013 16:00:33 -0600 Subject: [PATCH] Handle 404 for latency.txt requests, Fixes #27 --- speedtest_cli.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/speedtest_cli.py b/speedtest_cli.py index 5e1f28d..1e27cc4 100755 --- a/speedtest_cli.py +++ b/speedtest_cli.py @@ -18,9 +18,9 @@ __version__ = '0.2.2' try: - from urllib2 import urlopen, Request + from urllib2 import urlopen, Request, HTTPError except ImportError: - from urllib.request import urlopen, Request + from urllib.request import urlopen, Request, HTTPError import math import time @@ -323,7 +323,11 @@ def getBestServer(servers): cum = [] url = os.path.dirname(server['url']) for i in range(0, 3): - uh = urlopen('%s/latency.txt' % url) + try: + uh = urlopen('%s/latency.txt' % url) + except HTTPError: + cum.append(3600) + continue start = time.time() text = uh.read(9) total = time.time() - start