GAIAPCR-1313 Make use of astropy_format to check if the format is a v…

…otable
astropy · May 1, 2024 · 13c8ba6 · 13c8ba6
1 parent b0d4cbe
commit 13c8ba6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/astroquery/utils/tap/model/modelutils.py b/astroquery/utils/tap/model/modelutils.py
@@ -33,6 +33,7 @@ def check_file_exists(file_name):
 
 
 def read_results_table_from_file(file_name, output_format, *, correct_units=True, use_names_over_ids=False):
+
     astropy_format = utils.get_suitable_astropy_format(output_format)
 
     if check_file_exists(file_name):
@@ -65,7 +66,7 @@ def read_results_table_from_file(file_name, output_format, *, correct_units=True
                 return result
 
         else:
-            if output_format == 'votable':
+            if astropy_format == 'votable':
                 result = APTable.read(file_name, format=astropy_format, use_names_over_ids=use_names_over_ids)
             else:
                 result = APTable.read(file_name, format=astropy_format)

diff --git a/astroquery/utils/tap/xmlparser/utils.py b/astroquery/utils/tap/xmlparser/utils.py
@@ -34,7 +34,7 @@ def read_http_response(response, output_format, *, correct_units=True, use_names
     data = io.BytesIO(response.read())
 
     try:
-        if output_format == 'votable':
+        if astropy_format == 'votable':
             result = APTable.read(io.BytesIO(gzip.decompress(data.read())), format=astropy_format,
                                   use_names_over_ids=use_names_over_ids)
         else:
@@ -66,7 +66,7 @@ def read_http_response(response, output_format, *, correct_units=True, use_names
             else:
                 result = APTable.read(data, format=astropy_format)
 
-        elif output_format == 'votable':
+        elif astropy_format == 'votable':
             result = APTable.read(data, format=astropy_format, use_names_over_ids=use_names_over_ids)
         else:
             result = APTable.read(data, format=astropy_format)