summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-02-20 23:34:05 (GMT)
committerGeorg Brandl <georg@python.org>2012-02-20 23:34:05 (GMT)
commit802505d05e7346df9d0a8feea61f22deaf48d268 (patch)
tree2aa57c06d5389eba48e763e217f87742aa2d6f4c /Lib
parent2fb477c0f0284439d40cb3f46eea45ef42446e53 (diff)
parent178e5ea305848015d514f4038118777374e44c87 (diff)
downloadcpython-802505d05e7346df9d0a8feea61f22deaf48d268.zip
cpython-802505d05e7346df9d0a8feea61f22deaf48d268.tar.gz
cpython-802505d05e7346df9d0a8feea61f22deaf48d268.tar.bz2
Merge more test vs hashing-order fixes from 3.2.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_inspect.py3
-rw-r--r--Lib/test/test_weakset.py1
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 7407c1c..d840bbe 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -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')
diff --git a/Lib/test/test_weakset.py b/Lib/test/test_weakset.py
index 58a1f87..3cddf40 100644
--- a/Lib/test/test_weakset.py
+++ b/Lib/test/test_weakset.py
@@ -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