[Python-checkins] r64903 - in python/trunk: Lib/dummy_thread.py Lib/test/test_dummy_thread.py Misc/NEWS

[brett.cannon]

Author: brett.cannon
Date: Sun Jul 13 03:15:07 2008
New Revision: 64903

Log:
dummy_thread.acquire() would return None if no waitflag argument was given. It
should have returned True.

Fixes issue #3339. Thanks, Henk Punt for the report and Andrii v. Mishkovskiyi
for attempting a patch.


Modified:
   python/trunk/Lib/dummy_thread.py
   python/trunk/Lib/test/test_dummy_thread.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Lib/dummy_thread.py
==============================================================================
--- python/trunk/Lib/dummy_thread.py	(original)
+++ python/trunk/Lib/dummy_thread.py	Sun Jul 13 03:15:07 2008
@@ -104,18 +104,15 @@
         aren't triggered and throw a little fit.
 
         """
-        if waitflag is None:
+        if waitflag is None or waitflag:
             self.locked_status = True
-            return None
-        elif not waitflag:
+            return True
+        else:
             if not self.locked_status:
                 self.locked_status = True
                 return True
             else:
                 return False
-        else:
-            self.locked_status = True
-            return True
 
     __enter__ = acquire
 

Modified: python/trunk/Lib/test/test_dummy_thread.py
==============================================================================
--- python/trunk/Lib/test/test_dummy_thread.py	(original)
+++ python/trunk/Lib/test/test_dummy_thread.py	Sun Jul 13 03:15:07 2008
@@ -60,6 +60,7 @@
         #Make sure that an unconditional locking returns True.
         self.failUnless(self.lock.acquire(1) is True,
                         "Unconditional locking did not return True.")
+        self.failUnless(self.lock.acquire() is True)
 
     def test_uncond_acquire_blocking(self):
         #Make sure that unconditional acquiring of a locked lock blocks.

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sun Jul 13 03:15:07 2008
@@ -10,7 +10,6 @@
 Core and Builtins
 -----------------
 
-
 - Issue #2517: Allow unicode messages in Exceptions again by correctly
   bypassing the instance dictionary when looking up __unicode__ on
   new-style classes.
@@ -41,6 +40,8 @@
 Library
 -------
 
+- Issue #3339: dummy_thread.acquire() should not return None.
+
 - Issue #3285: Fractions from_float() and from_decimal() accept Integral arguments.
 
 - Issue #3301: Bisect module behaved badly when lo was negative.