File tree Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -1056,10 +1056,13 @@ def join(self, timeout=None):
1056
1056
raise RuntimeError ("cannot join thread before it is started" )
1057
1057
if self is current_thread ():
1058
1058
raise RuntimeError ("cannot join current thread" )
1059
+
1059
1060
if timeout is None :
1060
1061
self ._wait_for_tstate_lock ()
1061
- else :
1062
+ elif timeout >= 0 :
1062
1063
self ._wait_for_tstate_lock (timeout = timeout )
1064
+ # else it's a negative timeout - precise behavior isn't documented
1065
+ # then, but historically .join() returned in this case
1063
1066
1064
1067
def _wait_for_tstate_lock (self , block = True , timeout = - 1 ):
1065
1068
# Issue #18808: wait for the thread state to be gone.
Original file line number Diff line number Diff line change @@ -27,6 +27,8 @@ Core and Builtins
27
27
Library
28
28
-------
29
29
30
+ - Issue #19399: fix sporadic test_subprocess failure.
31
+
30
32
- Issue #13234: Fix os.listdir to work with extended paths on Windows.
31
33
Patch by Santoso Wijaya.
32
34
You can’t perform that action at this time.
0 commit comments