From: Brett Cannon <bcannon@gmail.com>
Date: Mon, 8 Mar 2004 22:18:57 +0000 (+0000)
Subject: Remove calls to currentThread() in _Condition methods that were side-effect.
X-Git-Tag: v2.4a1~732
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b6b7f151501eaee0af46220553c78607474e420;p=thirdparty%2FPython%2Fcpython.git

Remove calls to currentThread() in _Condition methods that were side-effect.
Side-effects were deemed unnecessary and were causing problems at shutdown
time when threads were catching exceptions at start time and then triggering
exceptions trying to call currentThread() after gc'ed.  Masked the initial
exception which was deemed bad.

Fixes bug #754449 .
---

diff --git a/Lib/threading.py b/Lib/threading.py
index 6461adc47bd2..ec955c23cc06 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -193,7 +193,6 @@ class _Condition(_Verbose):
             return True
 
     def wait(self, timeout=None):
-        currentThread() # for side-effect
         assert self._is_owned(), "wait() of un-acquire()d lock"
         waiter = _allocate_lock()
         waiter.acquire()
@@ -235,7 +234,6 @@ class _Condition(_Verbose):
             self._acquire_restore(saved_state)
 
     def notify(self, n=1):
-        currentThread() # for side-effect
         assert self._is_owned(), "notify() of un-acquire()d lock"
         __waiters = self.__waiters
         waiters = __waiters[:n]