Author: Ronan Lamy <[email protected]>
Branch:
Changeset: r84941:707dee8f0d54
Date: 2016-06-05 17:42 +0100
http://bitbucket.org/pypy/pypy/changeset/707dee8f0d54/
Log: Compatibility with pytest 2.9.*
diff --git a/pypy/tool/pytest/appsupport.py b/pypy/tool/pytest/appsupport.py
--- a/pypy/tool/pytest/appsupport.py
+++ b/pypy/tool/pytest/appsupport.py
@@ -5,9 +5,9 @@
from pypy.interpreter.error import OperationError, oefmt
try:
+ from _pytest.assertion.reinterpret import reinterpret as interpret
+except ImportError:
from _pytest.assertion.newinterpret import interpret
-except ImportError:
- from _pytest.assertion.oldinterpret import interpret
# ____________________________________________________________
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
