summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-08-15 13:25:28 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-08-15 13:25:28 (GMT)
commit044446b67cfe108c215ac58ebc71778ca4e73aa5 (patch)
tree51dea842aef5ef01e1b59a509ceda44a56012f24 /Lib
parent43226f8bd0582e33810043d4f350f3d8d4a6e7c8 (diff)
downloadcpython-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 'Lib')
-rw-r--r--Lib/test/test_module.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_module.py b/Lib/test/test_module.py
index 225e954..0e56290 100644
--- a/Lib/test/test_module.py
+++ b/Lib/test/test_module.py
@@ -11,6 +11,7 @@ class ModuleTests(unittest.TestCase):
# and __doc__ is None
foo = ModuleType.__new__(ModuleType)
self.assertTrue(foo.__dict__ is None)
+ self.assertRaises(SystemError, dir, foo)
try:
s = foo.__name__
self.fail("__name__ = %s" % repr(s))