[py-svn] commit/pytest: RonnyPfannschmidt: fix a import strange loop that affects pypy test appsupport on python2.5
Bitbucket
commits-noreply at bitbucket.org
Fri Apr 13 12:45:11 CEST 2012
1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/changeset/111f17d50ad8/
changeset: 111f17d50ad8
user: RonnyPfannschmidt
date: 2012-04-13 12:41:02
summary: fix a import strange loop that affects pypy test appsupport on python2.5
affected #: 4 files
diff -r 4d4ce0192c296472a9cd0ad513d81950e4cc9502 -r 111f17d50ad8d28742b180908286b8f33bf351c3 _pytest/assertion/oldinterpret.py
--- 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 -r 4d4ce0192c296472a9cd0ad513d81950e4cc9502 -r 111f17d50ad8d28742b180908286b8f33bf351c3 _pytest/assertion/reinterpret.py
--- 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 -r 4d4ce0192c296472a9cd0ad513d81950e4cc9502 -r 111f17d50ad8d28742b180908286b8f33bf351c3 _pytest/assertion/util.py
--- 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
diff -r 4d4ce0192c296472a9cd0ad513d81950e4cc9502 -r 111f17d50ad8d28742b180908286b8f33bf351c3 testing/test_assertinterpret.py
--- a/testing/test_assertinterpret.py
+++ b/testing/test_assertinterpret.py
@@ -322,3 +322,18 @@
e = exvalue()
s = str(e)
assert "<MY42 object>< 0" in s
+
+ at py.test.mark.skipif("sys.version_info >= (2,6)")
+def test_oldinterpret_importation():
+ # we had a cyclic import there
+ # requires pytest on sys.path
+ res = py.std.subprocess.call([
+ py.std.sys.executable, '-c', str(py.code.Source("""
+ try:
+ from _pytest.assertion.newinterpret import interpret
+ except ImportError:
+ from _pytest.assertion.oldinterpret import interpret
+ """))
+ ])
+
+ assert res == 0
Repository URL: https://bitbucket.org/hpk42/pytest/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the pytest-commit
mailing list