Merge pull request #740 from stvoutsin/timeout-fix

FIX: Change tap to better handle timeout default based on context

Author: bsipocz

CHANGES.rst

@@ -4,6 +4,8 @@
 Enhancements and Fixes
 ----------------------
 
+- Improve handling of timeouts in tap wait and _update [#740]
+
 - Preserve text/plain error body in raise_if_error() after stream is consumed. [#736]
 
 - Provide an API for SoftId-compliant management of the 'User-Agent'

pyvo/dal/tap.py

@@ -718,7 +718,10 @@ def _update(self, wait_for_statechange=False, timeout=None):
         updates local job infos with remote values
         """
         if timeout is None:
-            timeout = DEFAULT_JOB_POLL_TIMEOUT
+            timeout = (
+                DEFAULT_JOB_WAIT_TIMEOUT if wait_for_statechange
+                else DEFAULT_JOB_POLL_TIMEOUT
+            )
         try:
             if wait_for_statechange:
                 response = self._session.get(
@@ -983,8 +986,9 @@ def wait(self, *, phases=None, timeout=DEFAULT_JOB_WAIT_TIMEOUT):
         ----------
         phases : list
             phases to wait for
-        timeout : float
-            maximum time to wait in seconds
+        timeout : float or None
+            maximum time to wait in seconds. If None, defaults to
+            ``DEFAULT_JOB_WAIT_TIMEOUT``.
 
         Raises
         ------