fix --genscript option to generate standalone scripts that also
work with python3.3 (importer ordering)
This commit is contained in:
parent
456731ed0f
commit
296f752cca
|
@ -4,6 +4,9 @@ Changes between 2.3.4 and 2.3.5dev
|
||||||
- issue257, assertion-triggered compilation of source ending in a
|
- issue257, assertion-triggered compilation of source ending in a
|
||||||
comment line doesn't blow up in python2.5 (fixed through py>=1.4.13.dev6)
|
comment line doesn't blow up in python2.5 (fixed through py>=1.4.13.dev6)
|
||||||
|
|
||||||
|
- fix --genscript option to generate standalone scripts that also
|
||||||
|
work with python3.3 (importer ordering)
|
||||||
|
|
||||||
- issue171 - in assertion rewriting, show the repr of some
|
- issue171 - in assertion rewriting, show the repr of some
|
||||||
global variables
|
global variables
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ if __name__ == "__main__":
|
||||||
sources = pickle.loads(zlib.decompress(base64.decodestring(sources)))
|
sources = pickle.loads(zlib.decompress(base64.decodestring(sources)))
|
||||||
|
|
||||||
importer = DictImporter(sources)
|
importer = DictImporter(sources)
|
||||||
sys.meta_path.append(importer)
|
sys.meta_path.insert(0, importer)
|
||||||
|
|
||||||
entry = "@ENTRY@"
|
entry = "@ENTRY@"
|
||||||
do_exec(entry, locals())
|
do_exec(entry, locals())
|
||||||
|
|
|
@ -66,7 +66,8 @@ def pytest_generate_tests(metafunc):
|
||||||
metafunc.addcall(funcargs={name: val})
|
metafunc.addcall(funcargs={name: val})
|
||||||
elif 'anypython' in metafunc.fixturenames:
|
elif 'anypython' in metafunc.fixturenames:
|
||||||
for name in ('python2.4', 'python2.5', 'python2.6',
|
for name in ('python2.4', 'python2.5', 'python2.6',
|
||||||
'python2.7', 'python3.1', 'pypy', 'jython'):
|
'python2.7', 'python3.2', "python3.3",
|
||||||
|
'pypy', 'jython'):
|
||||||
metafunc.addcall(id=name, param=name)
|
metafunc.addcall(id=name, param=name)
|
||||||
|
|
||||||
# XXX copied from execnet's conftest.py - needs to be merged
|
# XXX copied from execnet's conftest.py - needs to be merged
|
||||||
|
|
7
tox.ini
7
tox.ini
|
@ -80,13 +80,6 @@ commands=
|
||||||
py.test -n3 -rfsxX \
|
py.test -n3 -rfsxX \
|
||||||
--junitxml={envlogdir}/junit-{envname}.xml []
|
--junitxml={envlogdir}/junit-{envname}.xml []
|
||||||
|
|
||||||
[testenv:py32]
|
|
||||||
deps=py>=1.4.0
|
|
||||||
|
|
||||||
[testenv:py33]
|
|
||||||
deps=py>=1.4.0
|
|
||||||
:pypi:nose
|
|
||||||
|
|
||||||
[testenv:jython]
|
[testenv:jython]
|
||||||
changedir=testing
|
changedir=testing
|
||||||
commands=
|
commands=
|
||||||
|
|
Loading…
Reference in New Issue