[pypy-commit] pypy pytest: merge from default

2013-01-25 Thread RonnyPfannschmidt
Author: Ronny Pfannschmidt Branch: pytest Changeset: r60450:3395bce3ab2b Date: 2013-01-25 13:36 +0100 http://bitbucket.org/pypy/pypy/changeset/3395bce3ab2b/ Log:merge from default diff --git a/lib-python/2.7/test/test_iterlen.py b/lib-python/2.7/test/test_iterlen.py --- a/lib-python/2.7/tes

[pypy-commit] pypy pytest: merge from default

2013-01-18 Thread RonnyPfannschmidt
Author: Ronny Pfannschmidt Branch: pytest Changeset: r60174:1d88326d9eda Date: 2013-01-18 10:10 +0100 http://bitbucket.org/pypy/pypy/changeset/1d88326d9eda/ Log:merge from default diff --git a/pypy/jit/metainterp/compile.py b/pypy/jit/metainterp/compile.py --- a/pypy/jit/metainterp/compile.p