diff options
Diffstat (limited to 'Lib/threading.py')
| -rw-r--r-- | Lib/threading.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/threading.py b/Lib/threading.py index 0c92ab1..5d454b6 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -1059,10 +1059,10 @@ class Thread: if timeout is None: self._wait_for_tstate_lock() - elif timeout >= 0: - self._wait_for_tstate_lock(timeout=timeout) - # else it's a negative timeout - precise behavior isn't documented - # then, but historically .join() returned in this case + else: + # the behavior of a negative timeout isn't documented, but + # historically .join() has acted as if timeout=0 then + self._wait_for_tstate_lock(timeout=max(timeout, 0)) def _wait_for_tstate_lock(self, block=True, timeout=-1): # Issue #18808: wait for the thread state to be gone. |