#11565: Merge with 3.1.

This commit is contained in:
Ezio Melotti 2011-03-16 11:35:38 +02:00
commit 3b3499ba69
93 changed files with 124 additions and 124 deletions

View file

@ -783,7 +783,7 @@ class _TestEvent(BaseTestCase):
event = self.Event()
wait = TimingWrapper(event.wait)
# Removed temporaily, due to API shear, this does not
# Removed temporarily, due to API shear, this does not
# work with threading._Event objects. is_set == isSet
self.assertEqual(event.is_set(), False)
@ -1753,7 +1753,7 @@ class _TestFinalize(BaseTestCase):
util.Finalize(None, conn.send, args=('STOP',), exitpriority=-100)
# call mutliprocessing's cleanup function then exit process without
# call multiprocessing's cleanup function then exit process without
# garbage collecting locals
util._exit_function()
conn.close()