nodes: remove deprecated fspath Node constructor parameter

Deprecated feature scheduled for removal in pytest 9. Part of #13893.

Author: bluetech

doc/en/deprecations.rst

@@ -183,46 +183,6 @@ In ``9.0``, the warning will turn into an error, and in ``9.1`` :func:`pytest.im
 :class:`ImportError` by passing it to ``exc_type``.
 
 
-.. _node-ctor-fspath-deprecation:
-
-``fspath`` argument for Node constructors replaced with ``pathlib.Path``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 7.0
-
-In order to support the transition from ``py.path.local`` to :mod:`pathlib`,
-the ``fspath`` argument to :class:`~_pytest.nodes.Node` constructors like
-:func:`pytest.Function.from_parent()` and :func:`pytest.Class.from_parent()`
-is now deprecated.
-
-Plugins which construct nodes should pass the ``path`` argument, of type
-:class:`pathlib.Path`, instead of the ``fspath`` argument.
-
-Plugins which implement custom items and collectors are encouraged to replace
-``fspath`` parameters (``py.path.local``) with ``path`` parameters
-(``pathlib.Path``), and drop any other usage of the ``py`` library if possible.
-
-If possible, plugins with custom items should use :ref:`cooperative
-constructors <uncooperative-constructors-deprecated>` to avoid hardcoding
-arguments they only pass on to the superclass.
-
-.. note::
-    The name of the :class:`~_pytest.nodes.Node` arguments and attributes (the
-    new attribute being ``path``) is **the opposite** of the situation for
-    hooks, :ref:`outlined below <legacy-path-hooks-deprecated>` (the old
-    argument being ``path``).
-
-    This is an unfortunate artifact due to historical reasons, which should be
-    resolved in future versions as we slowly get rid of the :pypi:`py`
-    dependency (see :issue:`9283` for a longer discussion).
-
-Due to the ongoing migration of methods like :meth:`~pytest.Item.reportinfo`
-which still is expected to return a ``py.path.local`` object, nodes still have
-both ``fspath`` (``py.path.local``) and ``path`` (``pathlib.Path``) attributes,
-no matter what argument was used in the constructor. We expect to deprecate the
-``fspath`` attribute in a future release.
-
-
 Configuring hook specs/impls using markers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -353,6 +313,48 @@ an appropriate period of deprecation has passed.
 
 Some breaking changes which could not be deprecated are also listed.
 
+
+.. _node-ctor-fspath-deprecation:
+
+``fspath`` argument for Node constructors replaced with ``pathlib.Path``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 7.0
+.. versionremoved:: 9.1
+
+In order to support the transition from ``py.path.local`` to :mod:`pathlib`,
+the ``fspath`` argument to :class:`~_pytest.nodes.Node` constructors like
+:func:`pytest.Function.from_parent()` and :func:`pytest.Class.from_parent()`
+is now deprecated.
+
+Plugins which construct nodes should pass the ``path`` argument, of type
+:class:`pathlib.Path`, instead of the ``fspath`` argument.
+
+Plugins which implement custom items and collectors are encouraged to replace
+``fspath`` parameters (``py.path.local``) with ``path`` parameters
+(``pathlib.Path``), and drop any other usage of the ``py`` library if possible.
+
+If possible, plugins with custom items should use :ref:`cooperative
+constructors <uncooperative-constructors-deprecated>` to avoid hardcoding
+arguments they only pass on to the superclass.
+
+.. note::
+    The name of the :class:`~_pytest.nodes.Node` arguments and attributes (the
+    new attribute being ``path``) is **the opposite** of the situation for
+    hooks, :ref:`outlined below <legacy-path-hooks-deprecated>` (the old
+    argument being ``path``).
+
+    This is an unfortunate artifact due to historical reasons, which should be
+    resolved in future versions as we slowly get rid of the :pypi:`py`
+    dependency (see :issue:`9283` for a longer discussion).
+
+Due to the ongoing migration of methods like :meth:`~pytest.Item.reportinfo`
+which still is expected to return a ``py.path.local`` object, nodes still have
+both ``fspath`` (``py.path.local``) and ``path`` (``pathlib.Path``) attributes,
+no matter what argument was used in the constructor. We expect to deprecate the
+``fspath`` attribute in a future release.
+
+
 .. _sync-test-async-fixture:
 
 sync test depending on async fixture

src/_pytest/config/compat.py

@@ -14,7 +14,6 @@
 from warnings import warn
 
 from _pytest.warning_types import PytestDeprecationWarning
-from _pytest.warning_types import PytestRemovedIn9Warning
 from _pytest.warning_types import PytestRemovedIn10Warning
 from _pytest.warning_types import UnformattedWarning
 
@@ -39,14 +38,6 @@
 PRIVATE = PytestDeprecationWarning("A private pytest class or function was used.")
 
 
-NODE_CTOR_FSPATH_ARG = UnformattedWarning(
-    PytestRemovedIn9Warning,
-    "The (fspath: py.path.local) argument to {node_type_name} is deprecated. "
-    "Please use the (path: pathlib.Path) argument instead.\n"
-    "See https://docs.pytest.org/en/latest/deprecations.html"
-    "#fspath-argument-for-node-constructors-replaced-with-pathlib-path",
-)
-
 HOOK_LEGACY_MARKING = UnformattedWarning(
     PytestDeprecationWarning,
     "The hook{type} {fullname} uses old-style configuration options (marks or attributes).\n"

src/_pytest/deprecated.py

@@ -31,8 +31,6 @@
 from _pytest.compat import signature
 from _pytest.config import Config
 from _pytest.config import ConftestImportFailure
-from _pytest.config.compat import _check_path
-from _pytest.deprecated import NODE_CTOR_FSPATH_ARG
 from _pytest.mark.structures import Mark
 from _pytest.mark.structures import MarkDecorator
 from _pytest.mark.structures import NodeKeywords
@@ -71,27 +69,6 @@ def norm_sep(path: str | os.PathLike[str]) -> str:
 _T = TypeVar("_T")
 
 
-def _imply_path(
-    node_type: type[Node],
-    path: Path | None,
-    fspath: LEGACY_PATH | None,
-) -> Path:
-    if fspath is not None:
-        warnings.warn(
-            NODE_CTOR_FSPATH_ARG.format(
-                node_type_name=node_type.__name__,
-            ),
-            stacklevel=6,
-        )
-    if path is not None:
-        if fspath is not None:
-            _check_path(path, fspath)
-        return path
-    else:
-        assert fspath is not None
-        return Path(fspath)
-
-
 _NodeType = TypeVar("_NodeType", bound="Node")
 
 
@@ -173,7 +150,7 @@ def __init__(
         parent: Node | None = None,
         config: Config | None = None,
         session: Session | None = None,
-        fspath: LEGACY_PATH | None = None,
+        fspath: None = None,
         path: Path | None = None,
         nodeid: str | None = None,
     ) -> None:
@@ -199,10 +176,11 @@ def __init__(
                 raise TypeError("session or parent must be provided")
             self.session = parent.session
 
-        if path is None and fspath is None:
-            path = getattr(parent, "path", None)
-        #: Filesystem path where this node was collected from (can be None).
-        self.path: pathlib.Path = _imply_path(type(self), path, fspath=fspath)
+        if path is None:
+            assert parent is not None
+            path = parent.path
+        #: Filesystem path where this node was collected from.
+        self.path: pathlib.Path = path
 
         # The explicit annotation is to avoid publicly exposing NodeKeywords.
         #: Keywords/markers collected from all scopes.
@@ -248,7 +226,7 @@ def from_parent(cls, parent: Node, **kw) -> Self:
 
     @property
     def ihook(self) -> pluggy.HookRelay:
-        """fspath-sensitive hook proxy used to call pytest hooks."""
+        """Path-sensitive hook proxy used to call pytest hooks."""
         return self.session.gethookproxy(self.path)
 
     def __repr__(self) -> str:
@@ -576,7 +554,7 @@ class FSCollector(Collector, abc.ABC):
 
     def __init__(
         self,
-        fspath: LEGACY_PATH | None = None,
+        fspath: None = None,
         path_or_parent: Path | Node | None = None,
         path: Path | None = None,
         name: str | None = None,
@@ -592,8 +570,8 @@ def __init__(
             elif isinstance(path_or_parent, Path):
                 assert path is None
                 path = path_or_parent
+        assert path is not None
 
-        path = _imply_path(type(self), path, fspath=fspath)
         if name is None:
             name = path.name
             if parent is not None and parent.path != path:
@@ -633,7 +611,7 @@ def from_parent(
         cls,
         parent,
         *,
-        fspath: LEGACY_PATH | None = None,
+        fspath: None = None,
         path: Path | None = None,
         **kw,
     ) -> Self:

src/_pytest/nodes.py

@@ -45,7 +45,6 @@
 from _pytest.compat import get_real_func
 from _pytest.compat import getimfunc
 from _pytest.compat import is_async_function
-from _pytest.compat import LEGACY_PATH
 from _pytest.compat import NOTSET
 from _pytest.compat import safe_getattr
 from _pytest.compat import safe_isclass
@@ -654,7 +653,7 @@ class Package(nodes.Directory):
 
     def __init__(
         self,
-        fspath: LEGACY_PATH | None,
+        fspath: None,
         parent: nodes.Collector,
         # NOTE: following args are unused:
         config=None,

src/_pytest/python.py

@@ -1,10 +1,7 @@
 # mypy: allow-untyped-defs
 from __future__ import annotations
 
-import re
-
 from _pytest import deprecated
-from _pytest.compat import legacy_path
 from _pytest.pytester import Pytester
 import pytest
 from pytest import PytestDeprecationWarning
@@ -88,22 +85,3 @@ def __init__(self, foo: int, *, _ispytest: bool = False) -> None:
 
     # Doesn't warn.
     PrivateInit(10, _ispytest=True)
-
-
-def test_node_ctor_fspath_argument_is_deprecated(pytester: Pytester) -> None:
-    mod = pytester.getmodulecol("")
-
-    class MyFile(pytest.File):
-        def collect(self):
-            raise NotImplementedError()
-
-    with pytest.warns(
-        pytest.PytestDeprecationWarning,
-        match=re.escape(
-            "The (fspath: py.path.local) argument to MyFile is deprecated."
-        ),
-    ):
-        MyFile.from_parent(
-            parent=mod.parent,
-            fspath=legacy_path("bla"),
-        )

testing/deprecated_test.py

@@ -6,7 +6,6 @@
 import warnings
 
 from _pytest import nodes
-from _pytest.compat import legacy_path
 from _pytest.outcomes import OutcomeException
 from _pytest.pytester import Pytester
 from _pytest.warning_types import PytestWarning
@@ -36,18 +35,14 @@ def test_node_direct_construction_deprecated() -> None:
 def test_subclassing_both_item_and_collector_deprecated(
     request, tmp_path: Path
 ) -> None:
-    """
-    Verifies we warn on diamond inheritance as well as correctly managing legacy
-    inheritance constructors with missing args as found in plugins.
-    """
-    # We do not expect any warnings messages to issued during class definition.
+    """Verifies we warn on diamond inheritance from both Item and Collector."""
+    # We do not expect any warnings messages to be issued during class definition.
     with warnings.catch_warnings():
         warnings.simplefilter("error")
 
         class SoWrong(nodes.Item, nodes.File):
-            def __init__(self, fspath, parent):
-                """Legacy ctor with legacy call # don't wana see"""
-                super().__init__(fspath, parent)
+            def __init__(self, parent: nodes.Collector, path: Path) -> None:
+                super().__init__(name="broken", parent=parent, path=path)
 
             def collect(self):
                 raise NotImplementedError()
@@ -56,9 +51,7 @@ def runtest(self):
                 raise NotImplementedError()
 
     with pytest.warns(PytestWarning) as rec:
-        SoWrong.from_parent(
-            request.session, fspath=legacy_path(tmp_path / "broken.txt")
-        )
+        SoWrong.from_parent(request.session, path=tmp_path / "broken.txt")
     messages = [str(x.message) for x in rec]
     assert any(
         re.search(".*SoWrong.* not using a cooperative constructor.*", x)