From 476d210d09189abebadba9236c6127f889845573 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Wed, 7 Nov 2012 10:05:39 +0100 Subject: [PATCH] prolong workaround for jython AST bug http://bugs.jython.org/issue1497 to make pytest work for post-2.5.1 jython versions --- _pytest/__init__.py | 2 +- _pytest/assertion/newinterpret.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_pytest/__init__.py b/_pytest/__init__.py index b62e881cb..cd0dc64e4 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.3.3' +__version__ = '2.3.4.dev1' diff --git a/_pytest/assertion/newinterpret.py b/_pytest/assertion/newinterpret.py index de03eaf8b..e7e9658d7 100644 --- a/_pytest/assertion/newinterpret.py +++ b/_pytest/assertion/newinterpret.py @@ -11,7 +11,7 @@ from _pytest.assertion import util from _pytest.assertion.reinterpret import BuiltinAssertionError -if sys.platform.startswith("java") and sys.version_info < (2, 5, 2): +if sys.platform.startswith("java"): # See http://bugs.jython.org/issue1497 _exprs = ("BoolOp", "BinOp", "UnaryOp", "Lambda", "IfExp", "Dict", "ListComp", "GeneratorExp", "Yield", "Compare", "Call", diff --git a/setup.py b/setup.py index 59cd83a9f..b16bc946a 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ def main(): name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.3.3', + version='2.3.4.dev1', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],