Merge more test vs hashing-order fixes from 3.2.

This commit is contained in:
Georg Brandl 2012-02-21 00:34:05 +01:00
commit 802505d05e
2 changed files with 3 additions and 1 deletions

View file

@ -810,7 +810,8 @@ class TestGetcallargsFunctions(unittest.TestCase):
self.assertEqualException(f, '2, 3, 4')
self.assertEqualException(f, '1, 2, 3, a=1')
self.assertEqualException(f, '2, 3, 4, c=5')
self.assertEqualException(f, '2, 3, 4, a=1, c=5')
# XXX: success of this one depends on dict order
## self.assertEqualException(f, '2, 3, 4, a=1, c=5')
# f got an unexpected keyword argument
self.assertEqualException(f, 'c=2')
self.assertEqualException(f, '2, c=3')

View file

@ -335,6 +335,7 @@ class TestWeakSet(unittest.TestCase):
try:
it = iter(s)
next(it)
del it
# Schedule an item for removal and recreate it
u = ustr(str(items.pop()))
gc.collect() # just in case