From ed85c831548f4bae256b9ce90973ab74bf95c59f Mon Sep 17 00:00:00 2001 From: Zac Hatfield-Dodds Date: Tue, 25 Jun 2019 13:06:02 +1000 Subject: Deprecate funcargnames alias --- src/_pytest/compat.py | 4 ++++ src/_pytest/deprecated.py | 5 +++++ src/_pytest/fixtures.py | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/_pytest/compat.py b/src/_pytest/compat.py index 2c964f473..d238061b4 100644 --- a/src/_pytest/compat.py +++ b/src/_pytest/compat.py @@ -325,4 +325,8 @@ class FuncargnamesCompatAttr: @property def funcargnames(self): """ alias attribute for ``fixturenames`` for pre-2.3 compatibility""" + import warnings + from _pytest.deprecated import FUNCARGNAMES + + warnings.warn(FUNCARGNAMES, stacklevel=2) return self.fixturenames diff --git a/src/_pytest/deprecated.py b/src/_pytest/deprecated.py index 1c544fd36..e31b9eb0e 100644 --- a/src/_pytest/deprecated.py +++ b/src/_pytest/deprecated.py @@ -40,6 +40,11 @@ GETFUNCARGVALUE = RemovedInPytest4Warning( "getfuncargvalue is deprecated, use getfixturevalue" ) +FUNCARGNAMES = PytestDeprecationWarning( + "The `funcargnames` attribute was an alias for `fixturenames`, " + "since pytest 2.3 - use the newer attribute instead." +) + RAISES_MESSAGE_PARAMETER = PytestDeprecationWarning( "The 'message' parameter is deprecated.\n" "(did you mean to use `match='some regex'` to check the exception message?)\n" diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py index 0a792d11d..3262b65bb 100644 --- a/src/_pytest/fixtures.py +++ b/src/_pytest/fixtures.py @@ -654,7 +654,7 @@ class SubRequest(FixtureRequest): # if the executing fixturedef was not explicitly requested in the argument list (via # getfixturevalue inside the fixture call) then ensure this fixture def will be finished # first - if fixturedef.argname not in self.funcargnames: + if fixturedef.argname not in self.fixturenames: fixturedef.addfinalizer( functools.partial(self._fixturedef.finish, request=self) ) -- cgit v1.2.3