Skip to content

Commit e18db8a

Browse files
volodymyrssbsipocz
authored andcommitted
astropy version check breaks on windows?..
1 parent d653351 commit e18db8a

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

astroquery/heasarc/core.py

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616
__all__ = ['Heasarc', 'HeasarcClass']
1717

1818

19+
def Table_read(*args, **kwargs):
20+
# why does if commons.ASTROPY_LT_5_0 not work on Windows?
21+
try:
22+
return Table.read(*args, **kwargs, unit_parse_strict='silent')
23+
except TypeError:
24+
return Table.read(*args, **kwargs)
25+
26+
1927
@async_to_sync
2028
class HeasarcClass(BaseQuery):
2129

@@ -191,10 +199,7 @@ def _old_w3query_fallback(self, content):
191199
f.writeto(I)
192200
I.seek(0)
193201

194-
try:
195-
return Table.read(I)
196-
except:
197-
return Table.read(I, unit_parse_strict='silent')
202+
return Table_read(I)
198203

199204
def _fallback(self, text):
200205
"""
@@ -225,10 +230,7 @@ def _fallback(self, text):
225230

226231
data = StringIO(text.replace(old_table, "\n".join(new_table)))
227232

228-
try:
229-
return Table.read(data, hdu=1)
230-
except:
231-
return Table.read(data, hdu=1, unit_parse_strict='silent')
233+
return Table_read(data, hdu=1)
232234

233235
def _parse_result(self, response, verbose=False):
234236
# if verbose is False then suppress any VOTable related warnings
@@ -249,12 +251,7 @@ def _parse_result(self, response, verbose=False):
249251

250252
try:
251253
data = BytesIO(response.content)
252-
253-
# why does if commons.ASTROPY_LT_5_0 not work on Windows?
254-
try:
255-
return Table.read(data, hdu=1)
256-
except:
257-
return Table.read(data, hdu=1, unit_parse_strict='silent')
254+
return Table_read(data, hdu=1)
258255
except ValueError:
259256
try:
260257
return self._fallback(response.text)

0 commit comments

Comments
 (0)