well, let's just deprecate these then... ezpzzzz

Author: jakkdl

src/_pytest/deprecated.py

@@ -11,13 +11,42 @@
 
 from __future__ import annotations
 
+import sys
+from typing import TYPE_CHECKING
 from warnings import warn
 
 from _pytest.warning_types import PytestDeprecationWarning
 from _pytest.warning_types import PytestRemovedIn9Warning
 from _pytest.warning_types import UnformattedWarning
 
 
+# the `as` indicates explicit re-export to type checkers
+# mypy currently does not support overload+deprecated
+if sys.version_info >= (3, 13):
+    from warnings import deprecated as deprecated
+elif TYPE_CHECKING:
+    from typing_extensions import deprecated as deprecated
+else:
+
+    def deprecated(func: object) -> object:
+        return func
+
+
+CALLABLE_RAISES = PytestDeprecationWarning(
+    "The callable form of pytest.raises is deprecated.\n"
+    "Use `with pytest.raises(...):` instead."
+)
+
+CALLABLE_WARNS = PytestDeprecationWarning(
+    "The callable form of pytest.warns is deprecated.\n"
+    "Use `with pytest.warns(...):` instead."
+)
+CALLABLE_DEPRECATED_CALL = PytestDeprecationWarning(
+    "The callable form of pytest.deprecated_call is deprecated.\n"
+    "Use `with pytest.deprecated_call():` instead."
+)
+
+
 # set of plugins which have been integrated into the core; we use this list to ignore
 # them during registration to avoid conflicts
 DEPRECATED_EXTERNAL_PLUGINS = {

src/_pytest/python_api.py

@@ -22,8 +22,11 @@
 from typing import overload
 from typing import TYPE_CHECKING
 from typing import TypeVar
+import warnings
 
 import _pytest._code
+from _pytest.deprecated import CALLABLE_RAISES
+from _pytest.deprecated import deprecated
 from _pytest.outcomes import fail
 
 
@@ -806,6 +809,7 @@ def raises(
 
 
 @overload
+@deprecated("Use context-manager form instead")
 def raises(
     expected_exception: type[E] | tuple[type[E], ...],
     func: Callable[P, object],
@@ -1020,6 +1024,7 @@ def validate_exc(exc: type[E]) -> type[E]:
     else:
         if not callable(func):
             raise TypeError(f"{func!r} object (type: {type(func)}) must be callable")
+        warnings.warn(CALLABLE_RAISES, stacklevel=2)
         try:
             func(*args, **kwargs)
         except expected_exceptions as e:

src/_pytest/recwarn.py

@@ -17,11 +17,17 @@
 
 
 if TYPE_CHECKING:
+    from typing_extensions import ParamSpec
     from typing_extensions import Self
 
+    P = ParamSpec("P")
+
 import warnings
 
+from _pytest.deprecated import CALLABLE_DEPRECATED_CALL
+from _pytest.deprecated import CALLABLE_WARNS
 from _pytest.deprecated import check_ispytest
+from _pytest.deprecated import deprecated
 from _pytest.fixtures import fixture
 from _pytest.outcomes import Exit
 from _pytest.outcomes import fail
@@ -49,7 +55,8 @@ def deprecated_call(
 
 
 @overload
-def deprecated_call(func: Callable[..., T], *args: Any, **kwargs: Any) -> T: ...
+@deprecated("Use context-manager form instead")
+def deprecated_call(func: Callable[P, T], *args: P.args, **kwargs: P.kwargs) -> T: ...
 
 
 def deprecated_call(
@@ -79,11 +86,13 @@ def deprecated_call(
     one for each warning raised.
     """
     __tracebackhide__ = True
+    # potential QoL: allow `with deprecated_call:` - i.e. no parens
+    dep_warnings = (DeprecationWarning, PendingDeprecationWarning, FutureWarning)
     if func is not None:
-        args = (func, *args)
-    return warns(
-        (DeprecationWarning, PendingDeprecationWarning, FutureWarning), *args, **kwargs
-    )
+        warnings.warn(CALLABLE_DEPRECATED_CALL, stacklevel=2)
+        with warns(dep_warnings):
+            return func(*args, **kwargs)
+    return warns(dep_warnings, *args, **kwargs)
 
 
 @overload
@@ -95,18 +104,19 @@ def warns(
 
 
 @overload
+@deprecated("Use context-manager form instead")
 def warns(
     expected_warning: type[Warning] | tuple[type[Warning], ...],
-    func: Callable[..., T],
-    *args: Any,
-    **kwargs: Any,
+    func: Callable[P, T],
+    *args: P.args,
+    **kwargs: P.kwargs,
 ) -> T: ...
 
 
 def warns(
     expected_warning: type[Warning] | tuple[type[Warning], ...] = Warning,
+    func: Callable[..., object] | None = None,
     *args: Any,
-    match: str | re.Pattern[str] | None = None,
     **kwargs: Any,
 ) -> WarningsChecker | Any:
     r"""Assert that code raises a particular class of warning.
@@ -151,7 +161,8 @@ def warns(
 
     """
     __tracebackhide__ = True
-    if not args:
+    if func is None and not args:
+        match: str | re.Pattern[str] | None = kwargs.pop("match", None)
         if kwargs:
             argnames = ", ".join(sorted(kwargs))
             raise TypeError(
@@ -160,11 +171,11 @@ def warns(
             )
         return WarningsChecker(expected_warning, match_expr=match, _ispytest=True)
     else:
-        func = args[0]
         if not callable(func):
             raise TypeError(f"{func!r} object (type: {type(func)}) must be callable")
+        warnings.warn(CALLABLE_WARNS, stacklevel=2)
         with WarningsChecker(expected_warning, _ispytest=True):
-            return func(*args[1:], **kwargs)
+            return func(*args, **kwargs)
 
 
 class WarningsRecorder(warnings.catch_warnings):  # type:ignore[type-arg]

testing/_py/test_local.py

@@ -625,7 +625,8 @@ def test_chdir_gone(self, path1):
         p = path1.ensure("dir_to_be_removed", dir=1)
         p.chdir()
         p.remove()
-        pytest.raises(error.ENOENT, local)
+        with pytest.raises(error.ENOENT):
+            local()
         assert path1.chdir() is None
         assert os.getcwd() == str(path1)
 
@@ -998,8 +999,10 @@ def test_locked_make_numbered_dir(self, tmpdir):
                 assert numdir.new(ext=str(j)).check()
 
     def test_error_preservation(self, path1):
-        pytest.raises(EnvironmentError, path1.join("qwoeqiwe").mtime)
-        pytest.raises(EnvironmentError, path1.join("qwoeqiwe").read)
+        with pytest.raises(EnvironmentError):
+            path1.join("qwoeqiwe").mtime()
+        with pytest.raises(EnvironmentError):
+            path1.join("qwoeqiwe").read()
 
     # def test_parentdirmatch(self):
     #    local.parentdirmatch('std', startmodule=__name__)
@@ -1099,7 +1102,8 @@ def test_pyimport_check_filepath_consistency(self, monkeypatch, tmpdir):
         pseudopath = tmpdir.ensure(name + "123.py")
         mod.__file__ = str(pseudopath)
         monkeypatch.setitem(sys.modules, name, mod)
-        excinfo = pytest.raises(pseudopath.ImportMismatchError, p.pyimport)
+        with pytest.raises(pseudopath.ImportMismatchError) as excinfo:
+            p.pyimport()
         modname, modfile, orig = excinfo.value.args
         assert modname == name
         assert modfile == pseudopath
@@ -1397,7 +1401,8 @@ def test_stat_helpers(self, tmpdir, monkeypatch):
 
     def test_stat_non_raising(self, tmpdir):
         path1 = tmpdir.join("file")
-        pytest.raises(error.ENOENT, lambda: path1.stat())
+        with pytest.raises(error.ENOENT):
+            path1.stat()
         res = path1.stat(raising=False)
         assert res is None
 

testing/code/test_code.py

@@ -85,10 +85,8 @@ def test_code_from_func() -> None:
 def test_unicode_handling() -> None:
     value = "ąć".encode()
 
-    def f() -> None:
+    with pytest.raises(Exception) as excinfo:
         raise Exception(value)
-
-    excinfo = pytest.raises(Exception, f)
     str(excinfo)