summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2007-02-21 21:57:55 (GMT)
committerBrett Cannon <bcannon@gmail.com>2007-02-21 21:57:55 (GMT)
commit67582d2beee2fd67f18ec7cc9797c3b76342e510 (patch)
tree514ca4e1d54637473842c53492d945f293a66f1e
parentb38e2bcfd41f04644cef55e2b82fcd6b1696eb98 (diff)
downloadcpython-67582d2beee2fd67f18ec7cc9797c3b76342e510.zip
cpython-67582d2beee2fd67f18ec7cc9797c3b76342e510.tar.gz
cpython-67582d2beee2fd67f18ec7cc9797c3b76342e510.tar.bz2
Fix test_os from breakage due to dict views.
-rw-r--r--BROKEN1
-rw-r--r--Lib/test/mapping_tests.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/BROKEN b/BROKEN
index 034cd85..2967871 100644
--- a/BROKEN
+++ b/BROKEN
@@ -1,3 +1,2 @@
test_bsddb test_bsddb3 test_compile test_dumbdbm
test_importhooks test_iter test_iterlen test_minidom test_mutants
- test_os
diff --git a/Lib/test/mapping_tests.py b/Lib/test/mapping_tests.py
index 09e9dcb..77d66b2 100644
--- a/Lib/test/mapping_tests.py
+++ b/Lib/test/mapping_tests.py
@@ -101,7 +101,7 @@ class BasicTestMappingProtocol(unittest.TestCase):
#update
p.update(self.reference)
self.assertEqual(dict(p), self.reference)
- items = p.items()
+ items = list(p.items())
p = self._empty_mapping()
p.update(items)
self.assertEqual(dict(p), self.reference)