From f13724e2e3e7b66b09cca4608a57e68f7d303b6d Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Mon, 1 Jan 2024 13:10:56 +0200
Subject: [PATCH] Remove deprecated
 {FSCollector,Package}.{gethookproxy,isinitpath}

---
 src/_pytest/deprecated.py  |  5 -----
 src/_pytest/nodes.py       |  9 ---------
 testing/deprecated_test.py | 26 --------------------------
 3 files changed, 40 deletions(-)

diff --git a/src/_pytest/deprecated.py b/src/_pytest/deprecated.py
index 77279d634..4750bec5d 100644
--- a/src/_pytest/deprecated.py
+++ b/src/_pytest/deprecated.py
@@ -51,11 +51,6 @@ WARNING_CMDLINE_PREPARSE_HOOK = PytestRemovedIn8Warning(
     "Please use pytest_load_initial_conftests hook instead."
 )
 
-FSCOLLECTOR_GETHOOKPROXY_ISINITPATH = PytestRemovedIn8Warning(
-    "The gethookproxy() and isinitpath() methods of FSCollector and Package are deprecated; "
-    "use self.session.gethookproxy() and self.session.isinitpath() instead. "
-)
-
 STRICT_OPTION = PytestRemovedIn8Warning(
     "The --strict option is deprecated, use --strict-markers instead."
 )
diff --git a/src/_pytest/nodes.py b/src/_pytest/nodes.py
index 530714108..eefe690de 100644
--- a/src/_pytest/nodes.py
+++ b/src/_pytest/nodes.py
@@ -32,7 +32,6 @@ from _pytest.compat import LEGACY_PATH
 from _pytest.config import Config
 from _pytest.config import ConftestImportFailure
 from _pytest.config.compat import _check_path
-from _pytest.deprecated import FSCOLLECTOR_GETHOOKPROXY_ISINITPATH
 from _pytest.deprecated import NODE_CTOR_FSPATH_ARG
 from _pytest.mark.structures import Mark
 from _pytest.mark.structures import MarkDecorator
@@ -660,14 +659,6 @@ class FSCollector(Collector, abc.ABC):
         """The public constructor."""
         return super().from_parent(parent=parent, fspath=fspath, path=path, **kw)
 
-    def gethookproxy(self, fspath: "os.PathLike[str]"):
-        warnings.warn(FSCOLLECTOR_GETHOOKPROXY_ISINITPATH, stacklevel=2)
-        return self.session.gethookproxy(fspath)
-
-    def isinitpath(self, path: Union[str, "os.PathLike[str]"]) -> bool:
-        warnings.warn(FSCOLLECTOR_GETHOOKPROXY_ISINITPATH, stacklevel=2)
-        return self.session.isinitpath(path)
-
 
 class File(FSCollector, abc.ABC):
     """Base class for collecting tests from a file.
diff --git a/testing/deprecated_test.py b/testing/deprecated_test.py
index 0736ed1dc..c1d8ad59d 100644
--- a/testing/deprecated_test.py
+++ b/testing/deprecated_test.py
@@ -1,6 +1,5 @@
 import re
 import sys
-import warnings
 from pathlib import Path
 
 import pytest
@@ -68,31 +67,6 @@ def test_hookimpl_via_function_attributes_are_deprecated():
     assert record.filename == __file__
 
 
-def test_fscollector_gethookproxy_isinitpath(pytester: Pytester) -> None:
-    module = pytester.getmodulecol(
-        """
-        def test_foo(): pass
-        """,
-        withinit=True,
-    )
-    assert isinstance(module, pytest.Module)
-    package = module.parent
-    assert isinstance(package, pytest.Package)
-
-    with pytest.warns(pytest.PytestDeprecationWarning, match="gethookproxy"):
-        package.gethookproxy(pytester.path)
-
-    with pytest.warns(pytest.PytestDeprecationWarning, match="isinitpath"):
-        package.isinitpath(pytester.path)
-
-    # The methods on Session are *not* deprecated.
-    session = module.session
-    with warnings.catch_warnings(record=True) as rec:
-        session.gethookproxy(pytester.path)
-        session.isinitpath(pytester.path)
-    assert len(rec) == 0
-
-
 def test_strict_option_is_deprecated(pytester: Pytester) -> None:
     """--strict is a deprecated alias to --strict-markers (#7530)."""
     pytester.makepyfile(