summaryrefslogtreecommitdiff
path: root/Lib/threading.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-10-05 22:00:33 -0700
committerBenjamin Peterson <benjamin@python.org>2015-10-05 22:00:33 -0700
commit72181b2f5385cc709543250b37d077adf3d08043 (patch)
treea5ee8c3b03cb4e419197b736139ecac22469a5ee /Lib/threading.py
parent5db034acfaa79447cb5c310f6ad7071737474027 (diff)
parent15982aad2b09086b5d8819ed5dfb0ec6195fd41a (diff)
downloadcpython-git-72181b2f5385cc709543250b37d077adf3d08043.tar.gz
merge 3.4 (#25319)
Diffstat (limited to 'Lib/threading.py')
-rw-r--r--Lib/threading.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/threading.py b/Lib/threading.py
index 24cc911c20..4b4ec38f5e 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -499,7 +499,7 @@ class Event:
def _reset_internal_locks(self):
# private! called by Thread._reset_internal_locks by _after_fork()
- self._cond.__init__()
+ self._cond.__init__(Lock())
def is_set(self):
"""Return true if and only if the internal flag is true."""