traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Brett Cannon 2008-07-13 01:19:15 +00:00
parent 91b3d8d547
commit 40c8f23a25
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/_dummy_thread.py
View File

@ -104,18 +104,15 @@ class LockType(object):
aren't triggered and throw a little fit. aren't triggered and throw a little fit.
""" """
if waitflag is None: if waitflag is None or waitflag:
self.locked_status = True self.locked_status = True
return None return True
elif not waitflag: else:
if not self.locked_status: if not self.locked_status:
self.locked_status = True self.locked_status = True
return True return True
else: else:
return False return False
else:
self.locked_status = True
return True
__enter__ = acquire __enter__ = acquire

1
Lib/test/test_dummy_thread.py
View File

@ -60,6 +60,7 @@ class LockTests(unittest.TestCase):
#Make sure that an unconditional locking returns True. #Make sure that an unconditional locking returns True.
self.failUnless(self.lock.acquire(1) is True, self.failUnless(self.lock.acquire(1) is True,
"Unconditional locking did not return True.") "Unconditional locking did not return True.")
self.failUnless(self.lock.acquire() is True)
def test_uncond_acquire_blocking(self): def test_uncond_acquire_blocking(self):
#Make sure that unconditional acquiring of a locked lock blocks. #Make sure that unconditional acquiring of a locked lock blocks.