diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/_dummy_thread.py | 9 | ||||
| -rw-r--r-- | Lib/test/test_dummy_thread.py | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Lib/_dummy_thread.py b/Lib/_dummy_thread.py index 352215a..e03905c 100644 --- 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 5b7db18..ecac3ee 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. |