C9GACS-1079 add PR reference number

Author: Jorge Fernandez Hernandez

CHANGES.rst

@@ -34,6 +34,7 @@ gaia
 ^^^^
 
 - New datalink DR4 retrieval type RESIDUAL_IMAGE. [#3489]
+- The method ``load_data`` parses ecsv files [#3500].
 
 esa.hubble
 ^^^^^^^^^^

astroquery/gaia/core.py

@@ -20,6 +20,7 @@
 from astropy.coordinates import Angle
 from astropy.io import fits
 from astropy.io import votable
+from astropy.io.fits import TableHDU, BinTableHDU
 from astropy.table import Table
 from astropy.units import Quantity
 from astropy.utils.decorators import deprecated_renamed_argument
@@ -308,7 +309,9 @@ def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retr
                 shutil.rmtree(path)
             else:
                 for file in files.keys():
-                    os.remove(os.path.join(os.getcwd(), path, file))
+                    final_file = os.path.join(os.getcwd(), path, file)
+                    if os.path.isfile(final_file):
+                        os.remove(final_file)
 
         if verbose:
             if output_file_specified:
@@ -340,13 +343,13 @@ def __get_data_files(output_file, path):
 
             if key.endswith('.fits'):
                 tables = []
-                with fits.open(value) as hduList:
-                    num_hdus = len(hduList)
-                    for i in range(1, num_hdus):
-                        table = Table.read(hduList[i], format='fits')
-                        Gaia.correct_table_units(table)
-                        tables.append(table)
-                    files[key] = tables
+                with fits.open(value, memmap=False) as hduList:
+                    for hdu in hduList:
+                        if isinstance(hdu, TableHDU) or isinstance(hdu, BinTableHDU):
+                            table = Table.read(hdu, format='fits')
+                            Gaia.correct_table_units(table)
+                            tables.append(table)
+                files[key] = tables
 
             elif key.endswith('.xml'):
                 tables = []

astroquery/gaia/tests/test_gaiatap.py

@@ -1081,7 +1081,7 @@ def load_data_monkeypatched(self, params_dict, output_file, verbose):
     path.unlink()
 
 
-@pytest.mark.filterwarnings("ignore: ")
+@pytest.mark.filterwarnings("ignore:")
 def test_load_data_fits(monkeypatch, tmp_path, tmp_path_factory, patch_datetime_now):
     assert datetime.datetime.now(datetime.timezone.utc) == FAKE_TIME
 
@@ -1090,7 +1090,7 @@ def test_load_data_fits(monkeypatch, tmp_path, tmp_path_factory, patch_datetime_
 
     path = Path(os.getcwd(), output_file)
 
-    with open(DL_PRODUCTS_CSV, 'rb') as file:
+    with open(DL_PRODUCTS_FITS, 'rb') as file:
         zip_bytes = file.read()
 
     path.write_bytes(zip_bytes)