2 new commits in pytest: https://bitbucket.org/hpk42/pytest/commits/04c4997da865/ Changeset: 04c4997da865 Branch: python 3.1 fix User: jurko Date: 2014-05-13 21:05:53 Summary: use py.builtin.callable instead of raw callable in _pytest/runner.py
This is consistent with how callable() is called from the rest of pytest code (see _pytest/nose.py & _pytest/python.py) plus, as a nice side-effect, it makes pytest work correctly on Python 3.1. Affected #: 1 file diff -r 5b76c07eea06a7de5128444cbf8125bea7984dcb -r 04c4997da865344f2ebb8569c73c51c57cd4ba05 _pytest/runner.py --- a/_pytest/runner.py +++ b/_pytest/runner.py @@ -328,7 +328,7 @@ is called at the end of teardown_all(). """ assert colitem and not isinstance(colitem, tuple) - assert callable(finalizer) + assert py.builtin.callable(finalizer) #assert colitem in self.stack # some unit tests don't setup stack :/ self._finalizers.setdefault(colitem, []).append(finalizer) https://bitbucket.org/hpk42/pytest/commits/f0446f3f8db3/ Changeset: f0446f3f8db3 User: hpk42 Date: 2014-05-13 22:41:12 Summary: Merged in jurko/pytest/python 3.1 fix (pull request #168) use py.builtin.callable instead of raw callable in _pytest/runner.py Affected #: 1 file diff -r 5b76c07eea06a7de5128444cbf8125bea7984dcb -r f0446f3f8db3a9e03c0266d0be7e145c8a351f50 _pytest/runner.py --- a/_pytest/runner.py +++ b/_pytest/runner.py @@ -328,7 +328,7 @@ is called at the end of teardown_all(). """ assert colitem and not isinstance(colitem, tuple) - assert callable(finalizer) + assert py.builtin.callable(finalizer) #assert colitem in self.stack # some unit tests don't setup stack :/ self._finalizers.setdefault(colitem, []).append(finalizer) Repository URL: https://bitbucket.org/hpk42/pytest/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ pytest-commit mailing list pytest-commit@python.org https://mail.python.org/mailman/listinfo/pytest-commit