merge with default

--HG-- branch : issue463
2015-03-23 20:41:27 +01:00
parent 3ba3112a85 65ca554230
commit ce95437dee
7 changed files with 36 additions and 4 deletions
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -778,7 +778,6 @@ class Metafunc(FuncargnamesCompatAttr):
        self.fixturenames = fixtureinfo.names_closure
        self._arg2fixturedefs = fixtureinfo.name2fixturedefs
        self.cls = cls
-        self.module = module
        self._calls = []
        self._ids = py.builtin.set()