From d9fc21c416b9b56731bf1761a2bcd6ce00602122 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 7 Jan 2015 15:08:13 +0100
Subject: [PATCH] Allow specifying an alternate server URL

This fixes #119; I can now run

    python speedtest-cli.py --list-url https://phihag.de/speedtest-cli/serverlist.php

even from a CHINANET Internet connection.
---
 speedtest_cli.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/speedtest_cli.py b/speedtest_cli.py
index 105c390..08e11ce 100755
--- a/speedtest_cli.py
+++ b/speedtest_cli.py
@@ -337,19 +337,20 @@ def getConfig():
     return config
 
 
-def closestServers(client, all=False):
+def closestServers(client, list_url, all=False):
     """Determine the 5 closest speedtest.net servers based on geographic
     distance
     """
 
-    uh = urlopen('http://www.speedtest.net/speedtest-servers-static.php')
+    uh = urlopen(list_url)
     serversxml = []
     while 1:
         serversxml.append(uh.read(10240))
         if len(serversxml[-1]) == 0:
             break
-    if int(uh.code) != 200:
-        return None
+    if getattr(uh, 'code', None) is not None:  # Not a file: URL
+        if int(uh.code) != 200:
+            return None
     uh.close()
     try:
         try:
@@ -484,6 +485,11 @@ def speedtest():
     parser.add_argument('--server', help='Specify a server ID to test against')
     parser.add_argument('--mini', help='URL of the Speedtest Mini server')
     parser.add_argument('--source', help='Source IP address to bind to')
+    parser.add_argument('--list-url', metavar='URL',
+                        help='URL to load the server list from. '
+                             'Start with file: to load from a local file.',
+                        default='http://www.speedtest.net'
+                                '/speedtest-servers-static.php')
     parser.add_argument('--version', action='store_true',
                         help='Show the version number and exit')
 
@@ -514,7 +520,7 @@ def speedtest():
     if not args.simple:
         print_('Retrieving speedtest.net server list...')
     if args.list or args.server:
-        servers = closestServers(config['client'], True)
+        servers = closestServers(config['client'], args.list_url, True)
         if args.list:
             serverList = []
             for server in servers:
@@ -533,7 +539,7 @@ def speedtest():
                 pass
             sys.exit(0)
     else:
-        servers = closestServers(config['client'])
+        servers = closestServers(config['client'], args.list_url)
 
     if not args.simple:
         print_('Testing from %(isp)s (%(ip)s)...' % config['client'])