diff options
| author |   Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> | 2012-04-13 12:46:28 +0200 |
|---|---|---|
| committer | Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> | 2012-04-13 12:46:28 +0200 |
| commit | 168d4d12881b0874a4df5b5a78b1065a759a583a (patch) | |
| tree | b57d3c990231081d88e85d992f4e9c836a223a55 /_pytest | |
| parent | merge from default (diff) | |
| download | pypy-168d4d12881b0874a4df5b5a78b1065a759a583a.tar.gz pypy-168d4d12881b0874a4df5b5a78b1065a759a583a.tar.bz2 pypy-168d4d12881b0874a4df5b5a78b1065a759a583a.zip | |
apply patch from upstream that fixes armins py25 issue
Diffstat (limited to '_pytest')
| -rw-r--r-- | _pytest/assertion/oldinterpret.py | 3 | ||||
| -rw-r--r-- | _pytest/assertion/reinterpret.py | 3 | ||||
| -rw-r--r-- | _pytest/assertion/util.py | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/_pytest/assertion/oldinterpret.py b/_pytest/assertion/oldinterpret.py index 3ca12ec2b0..a90c91859c 100644 --- a/_pytest/assertion/oldinterpret.py +++ b/_pytest/assertion/oldinterpret.py @@ -1,8 +1,7 @@ import py import sys, inspect from compiler import parse, ast, pycodegen -from _pytest.assertion.util import format_explanation -from _pytest.assertion.reinterpret import BuiltinAssertionError +from _pytest.assertion.util import format_explanation, BuiltinAssertionError passthroughex = py.builtin._sysex diff --git a/_pytest/assertion/reinterpret.py b/_pytest/assertion/reinterpret.py index 6e9465d8a7..b0d5a66890 100644 --- a/_pytest/assertion/reinterpret.py +++ b/_pytest/assertion/reinterpret.py @@ -1,7 +1,6 @@ import sys import py - -BuiltinAssertionError = py.builtin.builtins.AssertionError +from _pytest.assertion.util import BuiltinAssertionError class AssertionError(BuiltinAssertionError): def __init__(self, *args): diff --git a/_pytest/assertion/util.py b/_pytest/assertion/util.py index a85ed99f71..c7ef6dd817 100644 --- a/_pytest/assertion/util.py +++ b/_pytest/assertion/util.py @@ -2,6 +2,7 @@ import py +BuiltinAssertionError = py.builtin.builtins.AssertionError # The _reprcompare attribute on the util module is used by the new assertion # interpretation code and assertion rewriter to detect this plugin was |