floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't try assertion rewriting on jython for now

This commit is contained in:
holger krekel 2011-09-21 06:45:40 +02:00
parent eaec527a60
commit fb6fc673b8
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -6,6 +6,7 @@ Changes between 2.1.1 and [NEXT VERSION]
- fix issue69 / assertion rewriting fixed on some boolean operations - fix issue69 / assertion rewriting fixed on some boolean operations
- fix issue68 / packages now work with assertion rewriting - fix issue68 / packages now work with assertion rewriting
- fix issue66: use different assertion rewriting caches when the -O option is passed - fix issue66: use different assertion rewriting caches when the -O option is passed
- don't try assertion rewriting on Jython, use reinterp
Changes between 2.1.0 and 2.1.1 Changes between 2.1.0 and 2.1.1
---------------------------------------------- ----------------------------------------------

2
_pytest/__init__.py
View File

@ -1,2 +1,2 @@
# #
__version__ = '2.1.2.dev1' __version__ = '2.1.2.dev2'

3
_pytest/assertion/__init__.py
View File

@ -38,6 +38,9 @@ def pytest_configure(config):
import ast import ast
except ImportError: except ImportError:
mode = "reinterp" mode = "reinterp"
else:
if sys.platform.startswith('java'):
mode = "reinterp"
if mode != "plain": if mode != "plain":
_load_modules(mode) _load_modules(mode)
def callbinrepr(op, left, right): def callbinrepr(op, left, right):

2
setup.py
View File

@ -24,7 +24,7 @@ def main():
name='pytest', name='pytest',
description='py.test: simple powerful testing with Python', description='py.test: simple powerful testing with Python',
long_description = long_description, long_description = long_description,
version='2.1.2.dev1', version='2.1.2.dev2',
url='http://pytest.org', url='http://pytest.org',
license='MIT license', license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],