Got rid of py.testisms.

--HG--
branch : trunk
21 files changed