Merge pull request #2319 from jd-au/CASDA-Download-file-names-with-plus

Decode plus signs in filenames when downloading

Author: bsipocz

astroquery/casda/core.py

@@ -241,7 +241,7 @@ def download_files(self, urls, savedir=''):
         filenames = []
         for url in urls:
             parseResult = urlparse(url)
-            local_filename = os.path.basename(parseResult.path)
+            local_filename = unquote(os.path.basename(parseResult.path))
             if os.name == 'nt':
                 # Windows doesn't allow special characters in filenames like
                 # ":" so replace them with an underscore

astroquery/casda/tests/test_casda.py

@@ -284,7 +284,8 @@ def test_stage_data(patch_get):
 
 def test_download_file(patch_get):
     urls = ['https://ingest.pawsey.org/bucket_name/path/askap_img.fits?security=stuff',
-            'http://casda.csiro.au/download/web/111-000-111-000/askap_img.fits.checksum']
+            'http://casda.csiro.au/download/web/111-000-111-000/askap_img.fits.checksum',
+            'https://ingest.pawsey.org.au/casda-prd-as110-01/dc52217/primary_images/RACS-DR1_0000%2B18A.fits?security=stuff']
     casda = Casda('user', 'password')
 
     # skip the actual downloading of the file
@@ -294,3 +295,4 @@ def test_download_file(patch_get):
     filenames = casda.download_files(urls)
     assert filenames[0].endswith('askap_img.fits')
     assert filenames[1].endswith('askap_img.fits.checksum')
+    assert filenames[2].endswith('RACS-DR1_0000+18A.fits')