diff --git a/tools/android/set_up_android.py b/tools/android/set_up_android.py index 207baea819..21434f4b45 100755 --- a/tools/android/set_up_android.py +++ b/tools/android/set_up_android.py @@ -2,6 +2,12 @@ import os, sys, shutil, collections from optparse import OptionParser +# Fix for python 2 +try: + input = raw_input +except NameError: + pass + def find_recursive(root, subpath, maxdepth=4): queue = collections.deque([(root, 0)]) if 'PATH' in os.environ: @@ -38,7 +44,7 @@ def query_path(title, option, default, subpath): default = '' if not default else os.path.abspath(default) searchHint = ', "s" to search' while True: - path = raw_input('Path to {0}{1} [{2}]:'.format(title, searchHint, default)) or default + path = input('Path to {0}{1} [{2}]:'.format(title, searchHint, default)) or default if len(searchHint) > 0 and path.lower().strip() == 's': found = find_recursive(os.path.expanduser('~'), subpath) if found: @@ -50,7 +56,7 @@ def query_path(title, option, default, subpath): if path and os.path.isfile(test): return os.path.abspath(path) else: - print 'Could not find {0}, not an {1} path.'.format(test, title) + print('Could not find {0}, not an {1} path.'.format(test, title)) sys.exit(1) def write_local_properties(sdkDir, ndkDir): @@ -64,7 +70,7 @@ def write_local_properties(sdkDir, ndkDir): # Create omim/android/local.properties androidRoot = os.path.join(os.path.dirname(sys.argv[0]), '..', '..', 'android') propsFile = os.path.join(androidRoot, 'local.properties') - print 'Writing {0}'.format(propsFile) + print('Writing {0}'.format(propsFile)) with open(propsFile, 'w') as f: f.write(content) @@ -74,7 +80,7 @@ def write_local_properties(sdkDir, ndkDir): if not os.path.exists(destFolder): os.makedirs(destFolder) dst = os.path.join(destFolder, 'local.properties') - print 'Copying to {0}'.format(dst) + print('Copying to {0}'.format(dst)) shutil.copy(propsFile, dst) if __name__ == '__main__': diff --git a/tools/python/hierarchy_to_countries.py b/tools/python/hierarchy_to_countries.py index 1d56a245d5..e4701d0092 100755 --- a/tools/python/hierarchy_to_countries.py +++ b/tools/python/hierarchy_to_countries.py @@ -179,4 +179,4 @@ if options.output: with open(options.output, 'w') as f: json.dump(stack[-1], f, indent=1) else: - print json.dumps(stack[-1], indent=1) + print(json.dumps(stack[-1], indent=1)) diff --git a/tools/python/road_runner.py b/tools/python/road_runner.py index 87f22922e9..3be3b96569 100644 --- a/tools/python/road_runner.py +++ b/tools/python/road_runner.py @@ -1,13 +1,14 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -import json -import os -import sys -import urllib2 - -from Queue import Queue +import os, sys, json from threading import Thread +try: + from urllib2 import urlopen + from Queue import Queue +except ImportError: + from urllib.request import urlopen + from queue import Queue ''' World road map generation script. @@ -20,7 +21,7 @@ WORKERS = 16 def get_way_ids(point1, point2, server): url = "http://{0}/wayid?z=18&loc={1},{2}&loc={3},{4}".format(server, point1[0], point1[1], point2[0], point2[1]) - request = urllib2.urlopen(url) + request = urlopen(url) data = json.load(request) if "way_ids" in data: return data["way_ids"] @@ -36,7 +37,7 @@ def each_to_each(points): def load_towns(path): result = [] if not os.path.isfile(path): - print "WARNING! File with towns not found!" + print("WARNING! File with towns not found!") return result with open(path, "r") as f: for line in f: @@ -48,7 +49,7 @@ def load_towns(path): def parallel_worker(tasks, capitals_list, towns_list): while True: if not tasks.qsize() % 1000: - print tasks.qsize() + print(tasks.qsize()) task = tasks.get() ids = get_way_ids(task[0], task[1], sys.argv[2]) for id in ids: @@ -59,15 +60,15 @@ def parallel_worker(tasks, capitals_list, towns_list): tasks.task_done() if len(sys.argv) < 3: - print "road_runner.py " + print("road_runner.py ") exit(1) if not os.path.isdir(sys.argv[1]): - print sys.argv[1], "is not a directory!" + print("{0} is not a directory!".format(sys.argv[1])) exit(1) towns = load_towns(os.path.join(sys.argv[1], "towns.csv")) -print "Have {0} towns".format(len(towns)) +print("Have {0} towns".format(len(towns))) tasks = each_to_each(towns) filtered = [] @@ -93,9 +94,9 @@ qtasks.join() with open(os.path.join(sys.argv[1], "ways.csv"),"w") as f: for way_id in capitals_list: - print >> f, "{0};world_level".format(way_id) + f.write("{0};world_level\n".format(way_id)) for way_id in towns_list: if way_id not in capitals_list: - print >> f, "{0};world_towns_level".format(way_id) + f.write("{0};world_towns_level\n".format(way_id)) -print "All done." +print("All done.") diff --git a/tools/unix/diff_features.py b/tools/unix/diff_features.py index ca96a752b5..df226c4d11 100755 --- a/tools/unix/diff_features.py +++ b/tools/unix/diff_features.py @@ -8,8 +8,8 @@ def parse_and_add(data, line): data[m.group(1)] = int(m.group(3)) if len(sys.argv) < 3: - print 'This tool compares type_statistics output for feature sizes' - print 'Usage: {0} [threshold_in_%]'.format(sys.argv[0]) + print('This tool compares type_statistics output for feature sizes') + print('Usage: {0} [threshold_in_%]'.format(sys.argv[0])) sys.exit(0) data1 = {} @@ -29,6 +29,6 @@ for k in data1: if k in data2: v2 = int(data2[k]) if v1 == 0 or v2 == 0 or max(v1, v2) / float(min(v1, v2)) > threshold and abs(v1 - v2) > min_diff: - print '{0}: {1} to {2}'.format(k, v1, v2) + print('{0}: {1} to {2}'.format(k, v1, v2)) elif v1 > min_diff: - print '- not found: {0}, {1}'.format(k, v1) + print('- not found: {0}, {1}'.format(k, v1)) diff --git a/tools/unix/diff_size.py b/tools/unix/diff_size.py index 966090c726..20bf48091b 100755 --- a/tools/unix/diff_size.py +++ b/tools/unix/diff_size.py @@ -2,8 +2,8 @@ import os, sys if len(sys.argv) < 3: - print 'This tool shows very different file sizes' - print 'Usage: {0} [threshold_in_%]'.format(sys.argv[0]) + print('This tool shows very different file sizes') + print('Usage: {0} [threshold_in_%]'.format(sys.argv[0])) sys.exit(0) new_path = sys.argv[1] @@ -21,6 +21,6 @@ for f in sorted(os.listdir(old_path)): old_size = os.path.getsize(old_file) if new_size + old_size > 0: if new_size == 0 or old_size == 0 or max(new_size, old_size) / float(min(new_size, old_size)) > threshold and abs(new_size - old_size) > min_diff: - print '{0}: {1} {2} to {3} MB'.format(f, old_size / 1024 / 1024, 'up' if new_size > old_size else 'down', new_size / 1024 / 1024) + print('{0}: {1} {2} to {3} MB'.format(f, old_size / 1024 / 1024, 'up' if new_size > old_size else 'down', new_size / 1024 / 1024)) else: - print 'Not found a mirror for {0}'.format(f) + print('Not found a mirror for {0}'.format(f))