From 317e4caca9a700fb3acb0198764794593dd9ec6c Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 7 Sep 2016 13:55:34 -0400 Subject: [PATCH] [fix] only percent quote the filename --- scripts/geodata/openaddresses/download_openaddresses.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/geodata/openaddresses/download_openaddresses.py b/scripts/geodata/openaddresses/download_openaddresses.py index f02965fa..e8cce89d 100644 --- a/scripts/geodata/openaddresses/download_openaddresses.py +++ b/scripts/geodata/openaddresses/download_openaddresses.py @@ -66,9 +66,13 @@ def openaddresses_download_all_files(out_dir): def openaddresses_download_configured_files(out_dir): for path in openaddresses_config.sources: + source = six.b('/').join([safe_encode(p) for p in path]) - zip_path = source + '.zip' - url = urljoin(OPENADDRESSES_LATEST_DIR, quote_plus(zip_path)) + filename = safe_encode(path[-1]) + six.b('.zip') + zip_path = filename + '.zip' + zip_url_path = six.b('/').join([safe_encode(p) for p in path[:-1]] + [quote_plus(filename)]) + + url = urljoin(OPENADDRESSES_LATEST_DIR, zip_url_path) print(six.u('doing {}').format(safe_decode(source))) success = download_and_unzip_file(url, out_dir)