From cd70eee24469b91d85bd66e31c44aad76d22f93a Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Sun, 11 Feb 2007 18:53:00 +0000 Subject: [PATCH] Another fix. Partly reverted the tweaks done by the previous fix. --- Lib/test/test_builtin.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index b6ac990b5ca..e22e73a7336 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -290,8 +290,8 @@ class BuiltinTest(unittest.TestCase): if key == 'a': return 12 raise KeyError - def __iter__(self): - return iter('xyz') + def keys(self): + return list('xyz') m = M() g = globals() @@ -313,8 +313,8 @@ class BuiltinTest(unittest.TestCase): if key == 'a': return 12 return dict.__getitem__(self, key) - def __iter__(self): - return iter('xyz') + def keys(self): + return list('xyz') d = D() self.assertEqual(eval('a', g, d), 12) @@ -346,8 +346,8 @@ class BuiltinTest(unittest.TestCase): class C: def __getitem__(self, item): raise KeyError(item) - def __iter__(self): - return 'a' # XXX Not quite faithful to the SF bug... + def keys(self): + return 1 # used to be 'a' but that's no longer an error self.assertRaises(TypeError, eval, 'dir()', globals(), C()) # Done outside of the method test_z to get the correct scope