[pypy-commit] pypy default: merge from pytest

Author: Ronny Pfannschmidt Branch: Changeset: r54654:5ce4a6d6c2ec Date: 2012-04-23 10:30 +0200 http://bitbucket.org/pypy/pypy/changeset/5ce4a6d6c2ec/ Log:merge from pytest diff --git a/pypy/pytest.ini b/pypy/pytest.ini --- a/pypy/pytest.ini +++ b/pypy/pytest.ini @@ -1,2 +1,2 @@ [pytest] -a

[pypy-commit] pypy default: merge from pytest

Author: Ronny Pfannschmidt Branch: Changeset: r54330:8bafd99b776b Date: 2012-04-13 12:47 +0200 http://bitbucket.org/pypy/pypy/changeset/8bafd99b776b/ Log:merge from pytest diff --git a/_pytest/assertion/oldinterpret.py b/_pytest/assertion/oldinterpret.py --- a/_pytest/assertion/oldinterpre