[Python-checkins] cpython (merge 3.2 -> default): Merge more test vs hashing-order fixes from 3.2.

Tue Feb 21 00:37:06 CET 2012

http://hg.python.org/cpython/rev/b0834452ccfb
changeset: 75098:b0834452ccfb
parent: 75097:ed76dc34b39d
parent: 75096:ee89a9eec88e
user: Georg Brandl <georg at python.org>
date: Tue Feb 21 00:34:05 2012 +0100
summary:
 Merge more test vs hashing-order fixes from 3.2.
files:
 Lib/test/test_inspect.py | 3 ++-
 Lib/test/test_weakset.py | 1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -810,7 +810,8 @@
 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
--- a/Lib/test/test_weakset.py
+++ b/Lib/test/test_weakset.py
@@ -335,6 +335,7 @@
 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
-- 
Repository URL: http://hg.python.org/cpython
