EUCLIDPCR-1971 Changed suggested in the PR: the astropy Table.read makes use of the format and the documentation of the parameter format has been improved.

Author: Jorge Fernandez Hernandez

astroquery/utils/tap/core.py

@@ -15,11 +15,12 @@
 """
 import getpass
 import os
-import requests
 import tempfile
-from astropy.table.table import Table
 from urllib.parse import urlencode
 
+import requests
+from astropy.table.table import Table
+
 from astroquery import log
 from astroquery.utils.tap import taputils
 from astroquery.utils.tap.conn.tapconn import TapConn
@@ -1342,7 +1343,8 @@ def upload_table(self, *, upload_resource=None, table_name=None, table_descripti
         table_description : str, optional, default None
             table description
         format : str, optional, default 'votable'
-            resource format
+            resource format.  Only formats described in
+            https://docs.astropy.org/en/stable/io/unified.html#built-in-table-readers-writers are accepted.
         verbose : bool, optional, default 'False'
             flag to display information about the process
         """
@@ -1415,7 +1417,7 @@ def __uploadTableMultipart(self, resource, *, table_name=None, table_description
                         chunk = f.read()
                     files = [['FILE', os.path.basename(resource), chunk]]
                 else:
-                    table = Table.read(str(resource))
+                    table = Table.read(str(resource), format=resource_format)
                     fh = tempfile.NamedTemporaryFile(delete=False)
                     table.write(fh, format='votable')
                     fh.close()

astroquery/utils/tap/tests/test_tap.py

@@ -1032,7 +1032,7 @@ def test_upload_table():
 
     file_ecsv = get_pkg_data_filename(os.path.join("data", 'test_upload_file', '1744351221317O-result.ecsv'),
                                       package=package)
-    job = tap.upload_table(upload_resource=file_ecsv, table_name=table_name, format='ecsv')
+    job = tap.upload_table(upload_resource=file_ecsv, table_name=table_name, format='ascii.ecsv')
 
     assert (job.jobid == jobid)
 
@@ -1061,7 +1061,7 @@ def test_upload_table():
     with pytest.raises(IORegistryError) as exc_info:
         job = tap.upload_table(upload_resource=file_json, table_name=table_name, format='json')
 
-    argument_ = "Format could not be identified based on the file name or contents, please provide a 'format' argument."
+    argument_ = "No reader defined for format 'json' and class 'Table'."
     assert (argument_ in str(exc_info.value))
 
     # Make use of an astropy table