diff --git a/_pytest/fixtures.py b/_pytest/fixtures.py index 5dbd1205d..38e96e891 100644 --- a/_pytest/fixtures.py +++ b/_pytest/fixtures.py @@ -864,11 +864,12 @@ def yield_fixture(scope="function", params=None, autouse=False, ids=None, name=N else: return FixtureFunctionMarker(scope, params, autouse, ids=ids, name=name) -defaultfuncargprefixmarker = fixture() -funcarg_prefix_warning = '{name}: declaring fixtures using "pytest_funcarg__" prefix is deprecated ' \ - 'and scheduled to be removed in pytest 4.0.\n' \ - 'remove the prefix and use the @pytest.fixture decorator instead' +defaultfuncargprefixmarker = fixture() +funcarg_prefix_warning = ( + '{name}: declaring fixtures using "pytest_funcarg__" prefix is deprecated ' + 'and scheduled to be removed in pytest 4.0.\n' + 'Please remove the prefix and use the @pytest.fixture decorator instead.') @fixture(scope="session") @@ -877,8 +878,6 @@ def pytestconfig(request): return request.config - - class FixtureManager: """ pytest fixtures definitions and information is stored and managed