summaryrefslogtreecommitdiff
path: root/Lib/threading.py
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2017-01-22 17:29:44 -0800
committerGregory P. Smith <greg@krypto.org>2017-01-22 17:29:44 -0800
commitd71a238820a6e746c7bb1995d8f236b40904924d (patch)
tree1da08aa6698b4a9dcaa5e90d9541b78ac11e1650 /Lib/threading.py
parentd49be132fb4eb2d302592ebd84fafc4a1c98e531 (diff)
parent424881df2c661ba4238f9f56f273a5f4974f74d4 (diff)
downloadcpython-d71a238820a6e746c7bb1995d8f236b40904924d.tar.gz
Issue #29335: Fix subprocess.Popen.wait() when the child process has
exited to a stopped instead of terminated state (ex: when under ptrace).
Diffstat (limited to 'Lib/threading.py')
-rw-r--r--Lib/threading.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/Lib/threading.py b/Lib/threading.py
index 06b7b9b4fa..4829ff426e 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -22,9 +22,11 @@ except ImportError:
# with the multiprocessing module, which doesn't provide the old
# Java inspired names.
-__all__ = ['active_count', 'Condition', 'current_thread', 'enumerate', 'Event',
- 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Thread', 'Barrier',
- 'Timer', 'ThreadError', 'setprofile', 'settrace', 'local', 'stack_size']
+__all__ = ['get_ident', 'active_count', 'Condition', 'current_thread',
+ 'enumerate', 'main_thread', 'TIMEOUT_MAX',
+ 'Event', 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Thread',
+ 'Barrier', 'BrokenBarrierError', 'Timer', 'ThreadError',
+ 'setprofile', 'settrace', 'local', 'stack_size']
# Rename some stuff so "from threading import *" is safe
_start_new_thread = _thread.start_new_thread