holger krekel committed f0446f3 Merge

Merged in jurko/pytest/python 3.1 fix (pull request #168)

use py.builtin.callable instead of raw callable in _pytest/

  • Participants
  • Parent commits 5b76c07, 04c4997

Comments (0)

Files changed (1)

File _pytest/

         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)