Followup to issue #11140 and r88682: also patch _dummy_thread.

Patch by Aymeric Augustin.
This commit is contained in:
Antoine Pitrou 2011-03-01 23:05:42 +00:00
parent 2512a8b62e
commit 819c40ff35
4 changed files with 5 additions and 8 deletions

View file

@ -24,11 +24,7 @@ TIMEOUT_MAX = 2**31
# imports are done when needed on a function-by-function basis. Since threads
# are disabled, the import lock should not be an issue anyway (??).
class error(Exception):
"""Dummy implementation of _thread.error."""
def __init__(self, *args):
self.args = args
error = RuntimeError
def start_new_thread(function, args, kwargs={}):
"""Dummy implementation of _thread.start_new_thread().

View file

@ -35,8 +35,8 @@ class LockTests(unittest.TestCase):
"Lock object did not release properly.")
def test_improper_release(self):
#Make sure release of an unlocked thread raises _thread.error
self.assertRaises(_thread.error, self.lock.release)
#Make sure release of an unlocked thread raises RuntimeError
self.assertRaises(RuntimeError, self.lock.release)
def test_cond_acquire_success(self):
#Make sure the conditional acquiring of the lock works.

View file

@ -35,6 +35,7 @@ Jon Anglin
Jason Asbahr
David Ascher
Chris AtLee
Aymeric Augustin
John Aycock
Jan-Hein Bührman
Donovan Baarda

View file

@ -44,7 +44,7 @@ Library
- Issue #11140: Lock.release() now raises a RuntimeError when attempting
to release an unacquired lock, as claimed in the threading documentation.
The _thread.error exception is now an alias of RuntimeError. Patch by
Filip Gruszczyński.
Filip Gruszczyński. Patch for _dummy_thread by Aymeric Augustin.
- Issue 8594: ftplib now provides a source_address parameter to specify which
(address, port) to bind to before connecting.