Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fiddled Thread.join() to be a little simpler. Kinda ;-)

This commit is contained in:
Tim Peters 2013-10-25 22:33:52 -05:00
parent e5bb0bf04d
commit 7bad39f174
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/threading.py
View File

@ -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.