Mercurial > cpython-lru_cache-weakref
changeset 68199:b82c3e593db6
Followup to issue #11140 and r88682: also patch _dummy_thread.
Patch by Aymeric Augustin.
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Tue, 01 Mar 2011 23:05:42 +0000 |
| parents | 9b7254670ce9 |
| children | 1d198518cb87 |
| files | Lib/_dummy_thread.py Lib/test/test_dummy_thread.py Misc/ACKS Misc/NEWS |
| diffstat | 4 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Lib/_dummy_thread.py Tue Mar 01 22:46:52 2011 +0000 +++ b/Lib/_dummy_thread.py Tue Mar 01 23:05:42 2011 +0000 @@ -24,11 +24,7 @@ # 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().
--- a/Lib/test/test_dummy_thread.py Tue Mar 01 22:46:52 2011 +0000 +++ b/Lib/test/test_dummy_thread.py Tue Mar 01 23:05:42 2011 +0000 @@ -35,8 +35,8 @@ "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.
--- a/Misc/ACKS Tue Mar 01 22:46:52 2011 +0000 +++ b/Misc/ACKS Tue Mar 01 23:05:42 2011 +0000 @@ -35,6 +35,7 @@ Jason Asbahr David Ascher Chris AtLee +Aymeric Augustin John Aycock Jan-Hein Bührman Donovan Baarda
--- a/Misc/NEWS Tue Mar 01 22:46:52 2011 +0000 +++ b/Misc/NEWS Tue Mar 01 23:05:42 2011 +0000 @@ -44,7 +44,7 @@ - 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.