From dc65aa1feacdf7e9b2f863d9d3d23683c48d3af4 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 16 Jul 2014 17:21:18 -0700 Subject: [PATCH] avoid importing old assertion interpretation code by default (fixes #537) --- CHANGELOG | 2 ++ _pytest/assertion/reinterpret.py | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 63aa51500..fa64e4d6d 100644 --- 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 --git a/_pytest/assertion/reinterpret.py b/_pytest/assertion/reinterpret.py index fe1f87d2d..6c52ee63f 100644 --- a/_pytest/assertion/reinterpret.py +++ b/_pytest/assertion/reinterpret.py @@ -45,10 +45,8 @@ class AssertionError(BuiltinAssertionError): 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