diff --git a/_pytest/fixtures.py b/_pytest/fixtures.py index 0116890c2..621e38057 100644 --- a/_pytest/fixtures.py +++ b/_pytest/fixtures.py @@ -51,9 +51,7 @@ def pytest_namespace(): 'module': pytest.Module, 'function': pytest.Item, }) - return { - 'collect': {'_fillfuncargs': fillfixtures} - } + return {} def get_scope_node(node, scope): diff --git a/pytest.py b/pytest.py index c6146e291..bac816b11 100644 --- a/pytest.py +++ b/pytest.py @@ -45,6 +45,7 @@ from _pytest.recwarn import warns, deprecated_call from _pytest.runner import fail, skip, importorskip, exit from _pytest.mark import MARK_GEN as mark from _pytest.skipping import xfail +from _pytest.fixtures import fillfixtures as _fillfuncargs set_trace = __pytestPDB.set_trace