[Python-checkins] r64905 - in python/branches/release25-maint: Lib/dummy_thread.py Lib/test/test_dummy_thread.py Misc/NEWS

[brett.cannon]

Author: brett.cannon
Date: Sun Jul 13 03:20:19 2008
New Revision: 64905

Log:
Backport of 64903.

Modified:
   python/branches/release25-maint/Lib/dummy_thread.py
   python/branches/release25-maint/Lib/test/test_dummy_thread.py
   python/branches/release25-maint/Misc/NEWS

Modified: python/branches/release25-maint/Lib/dummy_thread.py
==============================================================================
--- python/branches/release25-maint/Lib/dummy_thread.py	(original)
+++ python/branches/release25-maint/Lib/dummy_thread.py	Sun Jul 13 03:20:19 2008
@@ -107,18 +107,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/branches/release25-maint/Lib/test/test_dummy_thread.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_dummy_thread.py	(original)
+++ python/branches/release25-maint/Lib/test/test_dummy_thread.py	Sun Jul 13 03:20:19 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/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Sun Jul 13 03:20:19 2008
@@ -59,6 +59,9 @@
 Library
 -------
 
+- Issue #3339: dummy_thread.acquire() could return None which is not a valid
+  return value.
+
 - Issue #3116 and #1792:  Fix quadratic behavior in marshal.dumps().
 
 - Issue #2682: ctypes callback functions no longer contain a cyclic