Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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:23:05 +00:00
parent 1fff008326
commit 1432771d55
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/test_module.py
View File

@ -11,6 +11,7 @@ class ModuleTests(unittest.TestCase):
# and __doc__ is None # and __doc__ is None
foo = ModuleType.__new__(ModuleType) foo = ModuleType.__new__(ModuleType)
self.assertTrue(foo.__dict__ is None) self.assertTrue(foo.__dict__ is None)
self.assertRaises(SystemError, dir, foo)
try: try:
s = foo.__name__ s = foo.__name__
self.fail("__name__ = %s" % repr(s)) self.fail("__name__ = %s" % repr(s))

2
Misc/NEWS
View File

@ -12,6 +12,8 @@ What's New in Python 3.2 Alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #6707: dir() on an uninitialized module caused a crash.
- Issue #6540: Fixed crash for bytearray.translate() with invalid parameters. - Issue #6540: Fixed crash for bytearray.translate() with invalid parameters.
- Issue #6573: set.union() stopped processing inputs if an instance of self - Issue #6573: set.union() stopped processing inputs if an instance of self

8
Objects/object.c
View File

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