[Pytest-commit] commit/pytest: gutworth: avoid importing old assertion interpretation code by default (fixes #537)

[commits-noreply at bitbucket.org]

1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/18e7ceb385f8/
Changeset:   18e7ceb385f8
User:        gutworth
Date:        2014-07-17 02:21:18
Summary:     avoid importing old assertion interpretation code by default (fixes #537)
Affected #:  2 files

diff -r bc61fe662fa32521eab0b6f2c4ca427bdac0cd1f -r 18e7ceb385f84be419e6edb0630bdc048727c1c7 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 NEXT (2.6)
 -----------------------------------
 
+- fix issue537: Avoid importing old assertion reinterpretation code by default.
+
 - fix issue364: shorten and enhance tracebacks representation by default.  
   The new "--tb=auto" option (default) will only display long tracebacks
   for the first and last entry.  You can get the old behaviour of printing

diff -r bc61fe662fa32521eab0b6f2c4ca427bdac0cd1f -r 18e7ceb385f84be419e6edb0630bdc048727c1c7 _pytest/assertion/reinterpret.py
--- a/_pytest/assertion/reinterpret.py
+++ b/_pytest/assertion/reinterpret.py
@@ -45,10 +45,8 @@
 
 if sys.version_info > (3, 0):
     AssertionError.__module__ = "builtins"
-    reinterpret_old = "old reinterpretation not available for py3"
-else:
-    from _pytest.assertion.oldinterpret import interpret as reinterpret_old
+
 if sys.version_info >= (2, 6) or (sys.platform.startswith("java")):
     from _pytest.assertion.newinterpret import interpret as reinterpret
 else:
-    reinterpret = reinterpret_old
+    from _pytest.assertion.oldinterpret import interpret as reinterpret

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.