Mercurial > cpython-lru_cache-weakref
diff Objects/object.c @ 55647:4c51c4bffb21 3.1
Merged revisions 74459 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r74459 | benjamin.peterson | 2009-08-15 08:23:05 -0500 (Sat, 15 Aug 2009) | 9 lines
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
........
................
| author | Benjamin Peterson <benjamin@python.org> |
|---|---|
| date | Sat, 15 Aug 2009 13:25:28 +0000 |
| parents | db212869d814 |
| children | 3ec6b51cdbdd |
line wrap: on
line diff
--- a/Objects/object.c Fri Aug 14 08:15:41 2009 +0000 +++ b/Objects/object.c Sat Aug 15 13:25:28 2009 +0000 @@ -1265,9 +1265,11 @@ if (PyDict_Check(dict)) result = PyDict_Keys(dict); else { - PyErr_Format(PyExc_TypeError, - "%.200s.__dict__ is not a dictionary", - PyModule_GetName(obj)); + const char *name = PyModule_GetName(obj); + if (name) + PyErr_Format(PyExc_TypeError, + "%.200s.__dict__ is not a dictionary", + name); } }