diff options
| -rw-r--r-- | Lib/dummy_thread.py | 9 | ||||
| -rw-r--r-- | Lib/test/test_dummy_thread.py | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/Lib/dummy_thread.py b/Lib/dummy_thread.py index a72c92722f..fac5720479 100644 --- 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 f274e0a0d0..58faeb4289 100644 --- 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. @@ -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 |