diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-10-06 05:00:33 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-10-06 05:00:33 (GMT) |
| commit | 72181b2f5385cc709543250b37d077adf3d08043 (patch) | |
| tree | a5ee8c3b03cb4e419197b736139ecac22469a5ee /Lib/threading.py | |
| parent | 5db034acfaa79447cb5c310f6ad7071737474027 (diff) | |
| parent | 15982aad2b09086b5d8819ed5dfb0ec6195fd41a (diff) | |
| download | cpython-72181b2f5385cc709543250b37d077adf3d08043.zip cpython-72181b2f5385cc709543250b37d077adf3d08043.tar.gz cpython-72181b2f5385cc709543250b37d077adf3d08043.tar.bz2 | |
merge 3.4 (#25319)
Diffstat (limited to 'Lib/threading.py')
| -rw-r--r-- | Lib/threading.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/threading.py b/Lib/threading.py index 24cc911..4b4ec38 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.""" |