From 2626bb0f283b9c8e00ad3164fe51e202082ad4c9 Mon Sep 17 00:00:00 2001 From: Khlopkova Olga Date: Tue, 19 Jan 2021 12:28:17 +0300 Subject: [PATCH] [tools][transit] Fixes. --- tools/python/transit/gtfs/download_gtfs.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/python/transit/gtfs/download_gtfs.py b/tools/python/transit/gtfs/download_gtfs.py index 9e1716439a..ac895cd1bf 100644 --- a/tools/python/transit/gtfs/download_gtfs.py +++ b/tools/python/transit/gtfs/download_gtfs.py @@ -61,7 +61,7 @@ def parse_transitland_page(url): return gtfs_feeds_urls, next_page except requests.exceptions.HTTPError as http_err: - logger.error(f"HTTP error {http_err} downloading zip from url {url}") + logger.error(f"HTTP error {http_err} downloading zip from {url}") if http_err == 429: time.sleep(MAX_SLEEP_TIMEOUT_S) except requests.exceptions.RequestException as ex: @@ -104,9 +104,9 @@ def load_gtfs_feed_zip(path, url): return True except requests.exceptions.HTTPError as http_err: - logger.error(f"HTTP error {http_err} downloading zip from url {url}") + logger.error(f"HTTP error {http_err} downloading zip from {url}") except requests.exceptions.RequestException as ex: - logger.error(f"Exception {ex} downloading zip from url {url}") + logger.error(f"Exception {ex} downloading zip from {url}") retries -= 1 return False @@ -201,11 +201,7 @@ def crawl_transitland_for_feed_urls(out_path): def get_filename(file_prefix, index): - index_len = len(str(index)) - zeroes_prefix = ( - "" if MAX_INDEX_LEN < index_len else "0" * (MAX_INDEX_LEN - index_len) - ) - return f"{file_prefix}_{zeroes_prefix}{index}" + return f"{file_prefix}_{index:0{MAX_INDEX_LEN}d}" def load_gtfs_zips_from_urls(path, urls_file, threads_count, file_prefix):