Merged revisions 74457 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74457 | benjamin.peterson | 2009-08-15 08:16:38 -0500 (Sat, 15 Aug 2009) | 1 line

  #6707 fix a crash with dir() on an uninitialized module
........
This commit is contained in:
Benjamin Peterson 2009-08-15 13:18:47 +00:00
parent 1cfc9c0ef3
commit f492c36442
3 changed files with 8 additions and 3 deletions

View file

@ -1806,9 +1806,11 @@ _specialized_dir_module(PyObject *obj)
if (PyDict_Check(dict))
result = PyDict_Keys(dict);
else {
PyErr_Format(PyExc_TypeError,
"%.200s.__dict__ is not a dictionary",
PyModule_GetName(obj));
char *name = PyModule_GetName(obj);
if (name)
PyErr_Format(PyExc_TypeError,
"%.200s.__dict__ is not a dictionary",
name);
}
}