Merge more test vs hashing-order fixes from 3.2.

birkenfeld · birkenfeld · commit 802505d05e73 · 2012-02-21T00:34:05.000+01:00
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
@@ -810,7 +810,8 @@ def test_errors(self):
             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')
diff --git a/Lib/test/test_weakset.py b/Lib/test/test_weakset.py
@@ -335,6 +335,7 @@ def testcontext():
             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
