diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-08-15 13:25:28 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-08-15 13:25:28 (GMT) |
| commit | 044446b67cfe108c215ac58ebc71778ca4e73aa5 (patch) | |
| tree | 51dea842aef5ef01e1b59a509ceda44a56012f24 /Objects | |
| parent | 43226f8bd0582e33810043d4f350f3d8d4a6e7c8 (diff) | |
| download | cpython-044446b67cfe108c215ac58ebc71778ca4e73aa5.zip cpython-044446b67cfe108c215ac58ebc71778ca4e73aa5.tar.gz cpython-044446b67cfe108c215ac58ebc71778ca4e73aa5.tar.bz2 | |
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
........
................
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/object.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Objects/object.c b/Objects/object.c index a29c31a..b2c7c14 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1265,9 +1265,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)); + const char *name = PyModule_GetName(obj); + if (name) + PyErr_Format(PyExc_TypeError, + "%.200s.__dict__ is not a dictionary", + name); } } |