Merge branch 'master' into merge-master-into-features

Preparing for 3.0
2016-08-17 22:39:23 -03:00
parent 789e4670e7 3e685d6a8d
commit 463e6572c5
14 changed files with 210 additions and 58 deletions
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -1538,4 +1538,3 @@ class Function(FunctionMixin, pytest.Item, fixtures.FuncargnamesCompatAttr):
    def setup(self):
        super(Function, self).setup()
        fixtures.fillfixtures(self)
-