mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
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. ........
This commit is contained in:
parent
91b3d8d547
commit
40c8f23a25
2 changed files with 4 additions and 6 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue