Backport of 64903.

diff --git a/Lib/dummy_thread.py b/Lib/dummy_thread.py
index a72c92722f4fd2527d16c1eb484059993e6d31f9..fac572047984450f7b61f4b3a9c516a1222f49cd 100644 (file)
--- a/Lib/dummy_thread.py
+++ b/Lib/dummy_thread.py
@@ -107,18 +107,15 @@ class LockType(object):
         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
 

diff --git a/Lib/test/test_dummy_thread.py b/Lib/test/test_dummy_thread.py
index f274e0a0d0f6c8eea4f103be916acb4e6ec38804..58faeb42892d2d8878e4090e477005e4f0741b49 100644 (file)
--- a/Lib/test/test_dummy_thread.py
+++ b/Lib/test/test_dummy_thread.py
@@ -60,6 +60,7 @@ class LockTests(unittest.TestCase):
         #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.

diff --git a/Misc/NEWS b/Misc/NEWS
index c5cf068ea5c12737f685c110e5399b0f458dfcfa..fa9c9a6b6cf3e82ead0c0bd207ccdae388fb0ad3 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -59,6 +59,9 @@ Core and builtins
 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