mirror of https://github.com/python/cpython
Merged revisions 53859-53874 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r53861 | neal.norwitz | 2007-02-23 01:22:39 +0100 (Fri, 23 Feb 2007) | 1 line Fix typo in comment ........ r53864 | brett.cannon | 2007-02-23 15:28:25 +0100 (Fri, 23 Feb 2007) | 3 lines Refactor PEP 352 tests to make it easier in the future to make sure certain things cannot be raised or caught. ........
This commit is contained in:
parent
7ea15d0910
commit
fa353657f0
|
@ -113,6 +113,37 @@ class UsageTests(unittest.TestCase):
|
||||||
|
|
||||||
"""Test usage of exceptions"""
|
"""Test usage of exceptions"""
|
||||||
|
|
||||||
|
def raise_fails(self, object_):
|
||||||
|
"""Make sure that raising 'object_' triggers a TypeError."""
|
||||||
|
try:
|
||||||
|
raise object_
|
||||||
|
except TypeError:
|
||||||
|
return # What is expected.
|
||||||
|
self.fail("TypeError expected for raising %s" % type(object_))
|
||||||
|
|
||||||
|
def catch_fails(self, object_):
|
||||||
|
"""Catching 'object_' should raise a TypeError."""
|
||||||
|
try:
|
||||||
|
try:
|
||||||
|
raise StandardError
|
||||||
|
except object_:
|
||||||
|
pass
|
||||||
|
except TypeError:
|
||||||
|
pass
|
||||||
|
except StandardError:
|
||||||
|
self.fail("TypeError expected when catching %s" % type(object_))
|
||||||
|
|
||||||
|
try:
|
||||||
|
try:
|
||||||
|
raise StandardError
|
||||||
|
except (object_,):
|
||||||
|
pass
|
||||||
|
except TypeError:
|
||||||
|
return
|
||||||
|
except StandardError:
|
||||||
|
self.fail("TypeError expected when catching %s as specified in a "
|
||||||
|
"tuple" % type(object_))
|
||||||
|
|
||||||
def test_raise_new_style_non_exception(self):
|
def test_raise_new_style_non_exception(self):
|
||||||
# You cannot raise a new-style class that does not inherit from
|
# You cannot raise a new-style class that does not inherit from
|
||||||
# BaseException; the ability was not possible until BaseException's
|
# BaseException; the ability was not possible until BaseException's
|
||||||
|
@ -120,27 +151,12 @@ class UsageTests(unittest.TestCase):
|
||||||
# inherit from it.
|
# inherit from it.
|
||||||
class NewStyleClass(object):
|
class NewStyleClass(object):
|
||||||
pass
|
pass
|
||||||
try:
|
self.raise_fails(NewStyleClass)
|
||||||
raise NewStyleClass
|
self.raise_fails(NewStyleClass())
|
||||||
except TypeError:
|
|
||||||
pass
|
|
||||||
except:
|
|
||||||
self.fail("able to raise new-style class")
|
|
||||||
try:
|
|
||||||
raise NewStyleClass()
|
|
||||||
except TypeError:
|
|
||||||
pass
|
|
||||||
except:
|
|
||||||
self.fail("able to raise new-style class instance")
|
|
||||||
|
|
||||||
def test_raise_string(self):
|
def test_raise_string(self):
|
||||||
# Raising a string raises TypeError.
|
# Raising a string raises TypeError.
|
||||||
try:
|
self.raise_fails("spam")
|
||||||
raise "spam"
|
|
||||||
except TypeError:
|
|
||||||
pass
|
|
||||||
except:
|
|
||||||
self.fail("was able to raise a string exception")
|
|
||||||
|
|
||||||
def test_catch_string(self):
|
def test_catch_string(self):
|
||||||
# Catching a string should trigger a DeprecationWarning.
|
# Catching a string should trigger a DeprecationWarning.
|
||||||
|
|
Loading…
Reference in New Issue