diff --git a/CHANGELOG.rst b/CHANGELOG.rst index dd8647b8a..867ae6e45 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -21,16 +21,21 @@ enabled. This allows proper post mortem debugging for all applications which have significant logic in their tearDown machinery (`#1890`_). Thanks `@mbyt`_ for the PR. + +* Fix use of deprecated ``getfuncargvalue`` method in the internal doctest plugin. + Thanks `@ViviCoder`_ for the report (`#1898`_). .. _@joguSD: https://github.com/joguSD .. _@AiOO: https://github.com/AiOO .. _@mbyt: https://github.com/mbyt +.. _@ViviCoder: https://github.com/ViviCoder .. _#1857: https://github.com/pytest-dev/pytest/issues/1857 .. _#1864: https://github.com/pytest-dev/pytest/issues/1864 .. _#1888: https://github.com/pytest-dev/pytest/issues/1888 .. _#1891: https://github.com/pytest-dev/pytest/pull/1891 .. _#1890: https://github.com/pytest-dev/pytest/issues/1890 +.. _#1898: https://github.com/pytest-dev/pytest/issues/1898 3.0.1 diff --git a/_pytest/doctest.py b/_pytest/doctest.py index 144aa2a6d..f4782dded 100644 --- a/_pytest/doctest.py +++ b/_pytest/doctest.py @@ -88,7 +88,7 @@ class DoctestItem(pytest.Item): if self.dtest is not None: self.fixture_request = _setup_fixtures(self) globs = dict(getfixture=self.fixture_request.getfixturevalue) - for name, value in self.fixture_request.getfuncargvalue('doctest_namespace').items(): + for name, value in self.fixture_request.getfixturevalue('doctest_namespace').items(): globs[name] = value self.dtest.globs.update(globs)