extract out PyLong_AsLong __index__ deprecation

Signed-off-by: Michael Carlstrom <[email protected]>

Author: InvincibleRMC

tests/conftest.py

@@ -17,10 +17,12 @@
 import textwrap
 import traceback
 import weakref
-from typing import Callable
+from typing import Callable, SupportsIndex, TypeVar
 
 import pytest
 
+import env
+
 # Early diagnostic for failed imports
 try:
     import pybind11_tests
@@ -311,3 +313,19 @@ def backport(sanatized_string: SanitizedString) -> SanitizedString:
         return sanatized_string
 
     return backport
+
+_EXPECTED_T = TypeVar("_EXPECTED_T")
+
+# The implicit conversion from np.float32 is undesirable but currently accepted.
+# TODO: Avoid DeprecationWarning in `PyLong_AsLong` (and similar)
+# TODO: PyPy 3.8 does not behave like CPython 3.8 here yet (7.3.7)
+# https://github.com/pybind/pybind11/issues/3408
+@pytest.fixture
+def avoid_PyLong_AsLong_deprecation() -> Callable[[Callable[[SupportsIndex], _EXPECTED_T], SupportsIndex, _EXPECTED_T], bool]:
+    def check(convert: Callable[[SupportsIndex], _EXPECTED_T], value: SupportsIndex, expected: _EXPECTED_T) -> bool:
+        if sys.version_info < (3, 10) and env.CPYTHON:
+            with pytest.deprecated_call():
+                return convert(value) == expected
+        else:
+            return convert(value) == expected
+    return check

tests/env.py

@@ -4,8 +4,6 @@
 import sys
 import sysconfig
 
-import pytest
-
 ANDROID = sys.platform.startswith("android")
 LINUX = sys.platform.startswith("linux")
 MACOS = sys.platform.startswith("darwin")
@@ -29,19 +27,3 @@
     or GRAALPY
     or (CPYTHON and PY_GIL_DISABLED and (3, 13) <= sys.version_info < (3, 14))
 )
-
-
-def deprecated_call():
-    """
-    pytest.deprecated_call() seems broken in pytest<3.9.x; concretely, it
-    doesn't work on CPython 3.8.0 with pytest==3.3.2 on Ubuntu 18.04 (#2922).
-
-    This is a narrowed reimplementation of the following PR :(
-    https://github.com/pytest-dev/pytest/pull/4104
-    """
-    # TODO: Remove this when testing requires pytest>=3.9.
-    pieces = pytest.__version__.split(".")
-    pytest_major_minor = (int(pieces[0]), int(pieces[1]))
-    if pytest_major_minor < (3, 9):
-        return pytest.warns((DeprecationWarning, PendingDeprecationWarning))
-    return pytest.deprecated_call()

tests/test_builtin_casters.py

@@ -247,7 +247,7 @@ def test_integer_casting():
     assert "incompatible function arguments" in str(excinfo.value)
 
 
-def test_int_convert(doc):
+def test_int_convert(doc, avoid_PyLong_AsLong_deprecation):
     class Int:
         def __int__(self):
             return 42
@@ -300,15 +300,9 @@ def cant_convert(v):
 
     assert convert(7) == 7
     assert noconvert(7) == 7
-    assert convert(3.14159) == 3
+    assert avoid_PyLong_AsLong_deprecation(convert, 3.14159, 3)
     requires_conversion(3.14159)
-    # TODO: Avoid DeprecationWarning in `PyLong_AsLong` (and similar)
-    # TODO: PyPy 3.8 does not behave like CPython 3.8 here yet (7.3.7)
-    if sys.version_info < (3, 10) and env.CPYTHON:
-        with env.deprecated_call():
-            assert convert(Int()) == 42
-    else:
-        assert convert(Int()) == 42
+    assert avoid_PyLong_AsLong_deprecation(convert, Int(), 42)
     requires_conversion(Int())
     cant_convert(NotInt())
     cant_convert(Float())
@@ -326,7 +320,7 @@ def cant_convert(v):
     requires_conversion(RaisingValueErrorOnIndex())
 
 
-def test_float_convert(doc):
+def test_float_convert(doc, avoid_PyLong_AsLong_deprecation):
     class Int:
         def __int__(self):
             return -5
@@ -357,12 +351,12 @@ def cant_convert(v):
     assert pytest.approx(convert(Float())) == 41.45
     assert pytest.approx(convert(Index())) == -7.0
     assert isinstance(convert(Float()), float)
-    assert pytest.approx(convert(3)) == 3.0
+    assert avoid_PyLong_AsLong_deprecation(convert, 3, 3.0)
     assert pytest.approx(noconvert(3)) == 3.0
     cant_convert(Int())
 
 
-def test_numpy_int_convert():
+def test_numpy_int_convert(avoid_PyLong_AsLong_deprecation):
     np = pytest.importorskip("numpy")
 
     convert, noconvert = m.int_passthrough, m.int_passthrough_noconvert
@@ -375,14 +369,7 @@ def require_implicit(v):
     assert noconvert(np.intc(42)) == 42
 
     # The implicit conversion from np.float32 is undesirable but currently accepted.
-    # TODO: Avoid DeprecationWarning in `PyLong_AsLong` (and similar)
-    # TODO: PyPy 3.8 does not behave like CPython 3.8 here yet (7.3.7)
-    # https://github.com/pybind/pybind11/issues/3408
-    if (3, 8) <= sys.version_info < (3, 10) and env.CPYTHON:
-        with env.deprecated_call():
-            assert convert(np.float32(3.14159)) == 3
-    else:
-        assert convert(np.float32(3.14159)) == 3
+    assert avoid_PyLong_AsLong_deprecation(convert, np.float32(3.14159), 3)
     require_implicit(np.float32(3.14159))
 
 
@@ -483,7 +470,7 @@ def test_reference_wrapper():
     assert m.refwrap_call_iiw(IncType(10), m.refwrap_iiw) == [10, 10, 10, 10]
 
 
-def test_complex_cast(doc):
+def test_complex_cast(doc, avoid_PyLong_AsLong_deprecation):
     """std::complex casts"""
 
     class Complex:
@@ -526,8 +513,8 @@ def cant_convert(v):
     )
     assert doc(noconvert) == "complex_noconvert(arg0: complex) -> complex"
 
-    assert convert(1) == 1.0
-    assert convert(2.0) == 2.0
+    assert avoid_PyLong_AsLong_deprecation(convert, 1, 1.0)
+    assert avoid_PyLong_AsLong_deprecation(convert, 2.0, 2.0)
     assert convert(1 + 5j) == 1.0 + 5.0j
     assert convert(Complex()) == 5.0 + 4j
     assert convert(Float()) == 5.0