fixes #33

closed #34

see http://python-future.org/compatible_idioms.html

.gitignore

@@ -0,0 +1 @@
+/apple-cdn-speed.report

export-configure.py

@@ -1,6 +1,17 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import print_function, unicode_literals
+
+import json
+import os.path
+import sys
+from argparse import ArgumentParser
+from collections import defaultdict
+
+from io import open
+
+if sys.version_info[0] == 2:
+    str = unicode
 
 formats = {
     'hosts': '{ip:<15} {domain}',
@@ -10,8 +21,6 @@
 
 
 def check_requirements():
-    import sys
-
     def check_python_version():
         if sys.hexversion >= 0x2000000 and sys.hexversion <= 0x2070000:
             print('your "python" lower than 2.7.0 upgrade.')
@@ -25,7 +34,6 @@ def check_python_version():
 
 
 def find_fast_ip(ips):
-    from collections import defaultdict
     table = defaultdict(list)
     for item in sum(ips.values(), []):
         table[item['ip']].append(item['delta'])
@@ -53,17 +61,13 @@ def export(payload, target):
 
 
 def load_payload():
-    import json
-    import os.path
-    from io import open
     target_filename = 'apple-cdn-speed.report'
     if os.path.exists(target_filename):
         return json.load(open(target_filename, encoding='UTF-8'))
     print('please run "fetch-timeout.py" build "%s".' % target_filename)
 
 
 def main():
-    from argparse import ArgumentParser
     parser = ArgumentParser()
     parser.add_argument(
         'target',

fetch-timeout.py

@@ -1,15 +1,31 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import print_function, unicode_literals
+
+import json
+import multiprocessing
+import os.path
+import random
+import socket
+import sys
+from argparse import ArgumentParser
+from contextlib import closing
+from datetime import datetime
+
+from io import open
+
+if sys.version_info[0] == 2:
+    from urlparse import urlparse
+    str = unicode
+else:
+    from urllib.parse import urlparse
 
 timeout = 400  # unit ms
 concurrent = 10
 testing_times = 10
 
 
 def check_requirements():
-    import sys
-
     def check_python_version():
         if sys.hexversion >= 0x2000000 and sys.hexversion <= 0x2070000:
             print('your "python" lower than 2.7.0 upgrade.')
@@ -24,13 +40,10 @@ def check_python_version():
 
 def request(target):
     host, port = target
-    from socket import socket
-    from socket import error
-    from datetime import datetime
     try:
         begin_time = datetime.now()
 
-        conn = socket()
+        conn = socket.socket()
         conn.settimeout(timeout / 1000.0)
         conn.connect((host, port))
 
@@ -40,31 +53,26 @@ def request(target):
 
         rt = (delta.seconds * 1000) + (delta.microseconds / 1000.0)
         return host, rt
-    except error as err:
+    except socket.error as err:
         return host, False
 
 
-def handle_ip(target):
-    try:
-        from urllib.parse import urlparse
-    except ImportError:
-        from urlparse import urlparse
-
-    address = urlparse('http://%s' % target)
-    return address.hostname, address.port or 80
-
-
 def fetch(payload):
     if not payload:
         return
-    import multiprocessing
-    from contextlib import closing
+
+    def handle_ip(target):
+        address = urlparse('http://%s' % str(target))
+        return address.hostname, address.port or 80
+
     with closing(multiprocessing.Pool(concurrent)) as pool:
         for service_item in payload:
-            print(service_item['title'])
+            print(str(service_item['title']))
             print(', '.join(service_item['domains']))
             for name, ips in service_item['ips'].items():
-                ips = pool.map(request, map(handle_ip, ips * testing_times))
+                ips = ips * testing_times
+                random.shuffle(ips)
+                ips = pool.map(request, map(handle_ip, ips))
                 ips = sorted(
                     ({'ip': ip, 'delta': delta} for ip, delta in ips if delta),
                     key=lambda item: item['delta']
@@ -77,26 +85,24 @@ def fetch(payload):
 
 
 def load_payload(path):
-    import json
-    import os.path
-    from io import open
     if os.path.exists(path):
         with open(path, encoding='UTF-8') as fp:
             return json.loads(fp.read())
 
 
 def save_result(payload):
-    import json
-    from io import open
     target_filename = 'apple-cdn-speed.report'
-    try:
-        json.dump(payload, open(target_filename, 'wb'))
-    except:
-        json.dump(payload, open(target_filename, 'w'))
+    with open(target_filename, 'w', encoding='utf-8') as fp:
+        report_data = json.dumps(
+            payload,
+            sort_keys=True,
+            indent=4,
+            ensure_ascii=False
+        )
+        fp.write(str(report_data))
 
 
 def main():
-    from argparse import ArgumentParser
     parser = ArgumentParser()
     parser.add_argument('payload', help='payload')
     args = parser.parse_args()