diff options
| author | Brett Cannon <bcannon@gmail.com> | 2008-07-13 01:15:07 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2008-07-13 01:15:07 (GMT) |
| commit | 3d0b9f095a1ccda7d6c04a9a1d05d245d8b82e26 (patch) | |
| tree | 15c369ccd303f5300f4eadd3e66bc1df63f933fa /Lib/dummy_thread.py | |
| parent | 0522a9f1eba72a7fdb6b5b6065872654f1d6becc (diff) | |
| download | cpython-3d0b9f095a1ccda7d6c04a9a1d05d245d8b82e26.zip cpython-3d0b9f095a1ccda7d6c04a9a1d05d245d8b82e26.tar.gz cpython-3d0b9f095a1ccda7d6c04a9a1d05d245d8b82e26.tar.bz2 | |
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.
Diffstat (limited to 'Lib/dummy_thread.py')
| -rw-r--r-- | Lib/dummy_thread.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Lib/dummy_thread.py b/Lib/dummy_thread.py index c131384..16dcf7e 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 |
