Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMaksim Andrianov <maksimandrianov1@gmail.com>2019-05-29 13:11:16 +0300
committergmoryes <gmoryes@gmail.com>2019-05-29 13:50:06 +0300
commit1b83c08607ac18d95da23db0a5217171aa986ed0 (patch)
tree9d86dc58a0ed875333e6a819fda517bf6c248b4b /tools
parent93500d6af981057a11a87ee6bf4e4c702f7f4561 (diff)
[python] Fixes for python 3.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/python/post_generation/localads_mwm_to_csv.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/python/post_generation/localads_mwm_to_csv.py b/tools/python/post_generation/localads_mwm_to_csv.py
index af779a09c5..c66c51d40c 100755
--- a/tools/python/post_generation/localads_mwm_to_csv.py
+++ b/tools/python/post_generation/localads_mwm_to_csv.py
@@ -27,7 +27,7 @@ FAKE_FEATURE_ID = 100111000
def generate_id_from_name_and_version(name, version):
- return ctypes.c_long((adler32(name) << 32) | version).value
+ return ctypes.c_long((adler32(bytes(name, "utf-8")) << 32) | version).value
def parse_mwm(mwm_name, osm2ft_name, override_version, types_name):
@@ -88,6 +88,7 @@ def create_csv(output, mwm_path, osm2ft_path, types, version, threads):
writers = [Process(target=write_csv, args=(output, qtype)) for qtype in QUEUES]
for w in writers:
w.start()
+
pool = Pool(processes=threads)
for mwm_name in os.listdir(mwm_path):
if "World" in mwm_name or "minsk_pass" in mwm_name or not mwm_name.endswith(".mwm"):
@@ -96,7 +97,7 @@ def create_csv(output, mwm_path, osm2ft_path, types, version, threads):
if not os.path.exists(osm2ft_name):
logging.error("Cannot find %s", osm2ft_name)
sys.exit(2)
- parse_mwm_args = (os.path.join(mwm_path, mwm_name), osm2ft_name, version, types)
+ parse_mwm_args = (os.path.join(mwm_path, mwm_name), osm2ft_name, int(version), types)
pool.apply_async(parse_mwm, parse_mwm_args)
pool.close()
pool.join()