Merged revisions 64903 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64903 | brett.cannon | 2008-07-12 18:15:07 -0700 (Sat, 12 Jul 2008) | 6 lines

  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.
........

diff --git a/Lib/_dummy_thread.py b/Lib/_dummy_thread.py
index 352215ae67d1caf7eba2211e5c4960acf4f8ccc1..e03905c203764afad3e80c62be596fbcc6347ade 100644 (file)
--- a/Lib/_dummy_thread.py
+++ b/Lib/_dummy_thread.py
@@ -104,18 +104,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 5b7db188b7fc1815cf36ce14d3735fd36e3060a6..ecac3eed15cf602edc690cf9d70faee6b6db40b2 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.