Skip to content

Commit

Permalink
Merge pull request #490 from bsipocz/BUG_SIA2_session
Browse files Browse the repository at this point in the history
BUG: fix SIA2 session inheritance
  • Loading branch information
tomdonaldson authored Oct 11, 2023
2 parents ba81520 + 41b80f1 commit 6405cb4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
1.4.3 (unreleased)
==================

- Fix session inheritance in SIA2. [#490]


1.4.2 (2023-08-16)
==================
Expand Down
10 changes: 4 additions & 6 deletions pyvo/dal/sia2.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def search(url, pos=None, band=None, time=None, pol=None,
_SIA2_PARAMETERS
"""
service = SIA2Service(url)
service = SIA2Service(url, session=session)
return service.search(pos=pos, band=band, time=time, pol=pol,
field_of_view=field_of_view,
spatial_resolution=spatial_resolution,
Expand All @@ -130,8 +130,7 @@ def search(url, pos=None, band=None, time=None, pol=None,
facility=facility, collection=collection,
instrument=instrument, data_type=data_type,
calib_level=calib_level, target_name=target_name,
res_format=res_format, maxrec=maxrec,
session=session, **kwargs)
res_format=res_format, maxrec=maxrec, **kwargs)


search.__doc__ = search.__doc__.replace('_SIA2_PARAMETERS',
Expand Down Expand Up @@ -200,8 +199,7 @@ def search(self, pos=None, band=None, time=None, pol=None,
spectral_resolving_power=None, exptime=None,
timeres=None, publisher_did=None, facility=None, collection=None,
instrument=None, data_type=None, calib_level=None,
target_name=None, res_format=None, maxrec=None, session=None,
**kwargs):
target_name=None, res_format=None, maxrec=None, **kwargs):
"""
Performs a SIA2 search against a SIA2 service
Expand All @@ -221,7 +219,7 @@ def search(self, pos=None, band=None, time=None, pol=None,
instrument=instrument, data_type=data_type,
calib_level=calib_level, target_name=target_name,
res_format=res_format, maxrec=maxrec,
session=session, **kwargs).execute()
session=self._session, **kwargs).execute()


class SIA2Query(DALQuery, AxisParamMixin):
Expand Down

0 comments on commit 6405cb4

Please sign in to comment.