From 4f7f367391aca48f673bffa1a85275dd1be7339e Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Mon, 7 Mar 2016 17:06:22 -0600 Subject: [PATCH] Handle SSL errors, and specify scheme for CDN URLs --- speedtest.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/speedtest.py b/speedtest.py index 7676cec..6a9af24 100755 --- a/speedtest.py +++ b/speedtest.py @@ -205,7 +205,8 @@ else: # Exception "constants" to support Python 2 through Python 3 try: import ssl - HTTP_ERRORS = (HTTPError, URLError, socket.error, ssl.SSLError) + HTTP_ERRORS = (HTTPError, URLError, socket.error, ssl.SSLError, + ssl.CertificateError) except ImportError: HTTP_ERRORS = (HTTPError, URLError, socket.error) @@ -759,9 +760,9 @@ class Speedtest(object): urls = [ '://www.speedtest.net/speedtest-servers-static.php', - '://c.speedtest.net/speedtest-servers-static.php', + 'http://c.speedtest.net/speedtest-servers-static.php', '://www.speedtest.net/speedtest-servers.php', - '://c.speedtest.net/speedtest-servers.php', + 'http://c.speedtest.net/speedtest-servers.php', ] errors = []