mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

SF bug #1004669: Type returned from .keys() is not checked

Browse source
This commit is contained in:
Raymond Hettinger 2004-08-07 04:55:30 +00:00
parent 61992efc4b
commit 2a7dedef9e
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/test/test_builtin.py
View file

@ -322,6 +322,15 @@ class BuiltinTest(unittest.TestCase):
ss['a3'] = 'a2*7' ss['a3'] = 'a2*7'
self.assertEqual(ss['a3'], 210) self.assertEqual(ss['a3'], 210)
# Verify that dir() catches a non-list returned by eval
# SF bug #1004669
class C:
def __getitem__(self, item):
raise KeyError(item)
def keys(self):
return 'a'
self.assertRaises(TypeError, eval, 'dir()', globals(), C())
# Done outside of the method test_z to get the correct scope # Done outside of the method test_z to get the correct scope
z = 0 z = 0
f = open(TESTFN, 'w') f = open(TESTFN, 'w')

5
Objects/object.c
View file

@ -1702,6 +1702,11 @@ PyObject_Dir(PyObject *arg)
} }
assert(result); assert(result);
if (!PyList_Check(result)) {
PyErr_SetString(PyExc_TypeError,
"Expected keys() to be a list.");
goto error;
}
if (PyList_Sort(result) != 0) if (PyList_Sort(result) != 0)
goto error; goto error;
else else