Remove the exceptions builtin module, all the exceptions are already builtin.

This commit is contained in:
Neal Norwitz 2007-02-26 22:22:47 +00:00
parent f543348fff
commit 2633c69fae
15 changed files with 34 additions and 66 deletions

View file

@ -488,12 +488,12 @@ INFO:a.b.c.d:Info 5
-- log_test4 begin ---------------------------------------------------
config0: ok.
config1: ok.
config2: <type 'exceptions.AttributeError'>
config3: <type 'exceptions.KeyError'>
config2: <type 'AttributeError'>
config3: <type 'KeyError'>
-- log_test4 end ---------------------------------------------------
-- log_test5 begin ---------------------------------------------------
ERROR:root:just testing
<type 'exceptions.KeyError'>... Don't panic!
<type 'KeyError'>... Don't panic!
-- log_test5 end ---------------------------------------------------
-- logrecv output begin ---------------------------------------------------
ERR -> CRITICAL: Message 0 (via logrecv.tcp.ERR)

View file

@ -15,15 +15,6 @@ from test.test_support import TESTFN, unlink, run_unittest
class ExceptionTests(unittest.TestCase):
def testReload(self):
# Reloading the built-in exceptions module failed prior to Py2.2, while it
# should act the same as reloading built-in sys.
try:
import exceptions
reload(exceptions)
except ImportError as e:
self.fail("reloading exceptions: %s" % e)
def raise_catch(self, exc, excname):
try:
raise exc, "spam"
@ -289,7 +280,7 @@ class ExceptionTests(unittest.TestCase):
if type(e) is not exc:
raise
# Verify module name
self.assertEquals(type(e).__module__, 'exceptions')
self.assertEquals(type(e).__module__, '__builtin__')
# Verify no ref leaks in Exc_str()
s = str(e)
for checkArgName in expected:

View file

@ -1691,7 +1691,7 @@ Our ill-behaved code should be invoked during GC:
>>> g.next()
>>> del g
>>> sys.stderr.getvalue().startswith(
... "Exception exceptions.RuntimeError: 'generator ignored GeneratorExit' in "
... "Exception RuntimeError: 'generator ignored GeneratorExit' in "
... )
True
>>> sys.stderr = old
@ -1808,7 +1808,7 @@ to test.
... del l
... err = sys.stderr.getvalue().strip()
... err.startswith(
... "Exception exceptions.RuntimeError: RuntimeError() in <"
... "Exception RuntimeError: RuntimeError() in <"
... )
... err.endswith("> ignored")
... len(err.splitlines())

View file

@ -87,7 +87,7 @@ absolute_import_test = [
"a.module",
["a", "a.module",
"b", "b.x", "b.y", "b.z",
"__future__", "sys", "exceptions"],
"__future__", "sys", "gc"],
["blahblah", "z"], [],
"""\
mymodule.py
@ -96,11 +96,11 @@ a/module.py
from __future__ import absolute_import
import sys # sys
import blahblah # fails
import exceptions # exceptions
import gc # gc
import b.x # b.x
from b import y # b.y
from b.z import * # b.z.*
a/exceptions.py
a/gc.py
a/sys.py
import mymodule
a/b/__init__.py
@ -123,7 +123,7 @@ relative_import_test = [
"a.b.c", "a.b.c.moduleC",
"a.b.c.d", "a.b.c.e",
"a.b.x",
"exceptions"],
"gc"],
[], [],
"""\
mymodule.py
@ -131,8 +131,8 @@ a/__init__.py
from .b import y, z # a.b.y, a.b.z
a/module.py
from __future__ import absolute_import # __future__
import exceptions # exceptions
a/exceptions.py
import gc # gc
a/gc.py
a/sys.py
a/b/__init__.py
from ..b import x # a.b.x
@ -170,7 +170,7 @@ a/__init__.py
a/another.py
a/module.py
from .b import y, z # a.b.y, a.b.z
a/exceptions.py
a/gc.py
a/sys.py
a/b/__init__.py
from .c import moduleC # a.b.c.moduleC

View file

@ -104,9 +104,9 @@ class ReferencesTestCase(TestBase):
def check(proxy):
proxy.bar
self.assertRaises(weakref.ReferenceError, check, ref1)
self.assertRaises(weakref.ReferenceError, check, ref2)
self.assertRaises(weakref.ReferenceError, bool, weakref.proxy(C()))
self.assertRaises(ReferenceError, check, ref1)
self.assertRaises(ReferenceError, check, ref2)
self.assertRaises(ReferenceError, bool, weakref.proxy(C()))
self.assert_(self.cbcalled == 2)
def check_basic_ref(self, factory):