Remove BuiltinAssertionError

We used to have this when we where patching the real Python
AssertionError for use with reinterpret, but reinterpret is now
gone so we no longer need this as it is not used by rewrite.
This commit is contained in:
Floris Bruynooghe 2016-09-05 15:29:09 +02:00
parent 99a4a1a784
commit 28b1896e9a
3 changed files with 1 additions and 15 deletions

View File

@ -8,7 +8,7 @@ try:
except ImportError: except ImportError:
Sequence = list Sequence = list
BuiltinAssertionError = py.builtin.builtins.AssertionError
u = py.builtin._totext u = py.builtin._totext
# The _reprcompare attribute on the util module is used by the new assertion # The _reprcompare attribute on the util module is used by the new assertion

View File

@ -1146,12 +1146,6 @@ def raises(expected_exception, *args, **kwargs):
""" """
__tracebackhide__ = True __tracebackhide__ = True
if expected_exception is AssertionError:
# we want to catch a AssertionError
# replace our subclass with the builtin one
# see https://github.com/pytest-dev/pytest/issues/176
from _pytest.assertion.util import BuiltinAssertionError \
as expected_exception
msg = ("exceptions must be old-style classes or" msg = ("exceptions must be old-style classes or"
" derived from BaseException, not %s") " derived from BaseException, not %s")
if isinstance(expected_exception, tuple): if isinstance(expected_exception, tuple):

View File

@ -26,14 +26,6 @@ class TestRaises:
except pytest.raises.Exception: except pytest.raises.Exception:
pass pass
def test_raises_flip_builtin_AssertionError(self):
# we replace AssertionError on python level
# however c code might still raise the builtin one
from _pytest.assertion.util import BuiltinAssertionError # noqa
pytest.raises(AssertionError,"""
raise BuiltinAssertionError
""")
def test_raises_as_contextmanager(self, testdir): def test_raises_as_contextmanager(self, testdir):
testdir.makepyfile(""" testdir.makepyfile("""
from __future__ import with_statement from __future__ import with_statement