[Python-checkins] cpython (merge 3.4 -> 3.5): merge 3.4 (#25319)

Tue Oct 6 01:01:52 EDT 2015

https://hg.python.org/cpython/rev/3719e842a7b1
changeset: 98550:3719e842a7b1
branch: 3.5
parent: 98545:28fcd7f13613
parent: 98549:6108d30dde21
user: Benjamin Peterson <benjamin at python.org>
date: Mon Oct 05 22:00:33 2015 -0700
summary:
 merge 3.4 (#25319)
files:
 Lib/test/lock_tests.py | 8 ++++++++
 Lib/threading.py | 2 +-
 Misc/ACKS | 1 +
 Misc/NEWS | 3 +++
 4 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py
--- a/Lib/test/lock_tests.py
+++ b/Lib/test/lock_tests.py
@@ -394,6 +394,14 @@
 b.wait_for_finished()
 self.assertEqual(results, [True] * N)
 
+ def test_reset_internal_locks(self):
+ evt = self.eventtype()
+ old_lock = evt._cond._lock
+ evt._reset_internal_locks()
+ new_lock = evt._cond._lock
+ self.assertIsNot(new_lock, old_lock)
+ self.assertIs(type(new_lock), type(old_lock))
+
 
 class ConditionTests(BaseTestCase):
 """
diff --git a/Lib/threading.py b/Lib/threading.py
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -499,7 +499,7 @@
 
 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."""
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1352,6 +1352,7 @@
 Rafal Smotrzyk
 Eric Snow
 Dirk Soede
+Nir Soffer
 Paul Sokolovsky
 Evgeny Sologubov
 Cody Somerville
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -150,6 +150,9 @@
 - Issue #24881: Fixed setting binary mode in Python implementation of FileIO
 on Windows and Cygwin. Patch from Akira Li.
 
+- Issue #25319: When threading.Event is reinitialized, the underlying condition
+ should use a regular lock rather than a recursive lock.
+
 - Issue #21112: Fix regression in unittest.expectedFailure on subclasses.
 Patch from Berker Peksag.
 
-- 
Repository URL: https://hg.python.org/cpython
