test: drop wrap_method coverage, stop asserting Array type on __add__

dimbleby and davidpavlovschi both flagged the same thing from two
angles: wrap_method has been dead since #460, so testing it just locks
in code nobody calls. Removed it from _types.py along with the
Callable/Concatenate/ParamSpec plumbing that existed only for its
signature, and dropped the corresponding tests.

Also backed off the __add__ test's `assert not isinstance(result, Array)`.
That was asserting an implementation detail the PR description itself
called out as possibly unintended, and davidpavlovschi's right that a
coverage PR shouldn't be the thing that decides whether __add__ is
supposed to return a plain list or a wrapped Array. The test now just
checks the combined values.

Author: darrenhuai

tests/test_types.py

@@ -1,20 +1,16 @@
-from typing import Any
-
 import tomlkit
 
-from tomlkit._types import wrap_method
 from tomlkit.items import Array
 from tomlkit.items import Table
 
 
-def test_custom_list_add_returns_plain_list_with_combined_items() -> None:
+def test_custom_list_add_returns_combined_items() -> None:
     arr = tomlkit.array()
     arr.extend([1, 2, 3])
 
     result = arr + [4, 5]  # noqa: RUF005 (exercising __add__ itself)
 
     assert result == [1, 2, 3, 4, 5]
-    assert not isinstance(result, Array)
 
 
 def test_custom_list_iadd_mutates_in_place_and_keeps_wrapper_type() -> None:
@@ -50,34 +46,3 @@ def test_custom_dict_ior_mutates_in_place() -> None:
 
     assert dict(table) == {"x": 1, "y": 2}
     assert id(table) == original_id
-
-
-class _Wrapped:
-    def __init__(self, value: int) -> None:
-        self.value = value
-
-    def _new(self, value: int) -> "_Wrapped":
-        return _Wrapped(value)
-
-
-def test_wrap_method_wraps_result_via_new() -> None:
-    def raw_add(self: _Wrapped, other: int) -> int:
-        return self.value + other
-
-    wrapped_add = wrap_method(raw_add)
-    wrapped = _Wrapped(5)
-
-    result = wrapped_add(wrapped, 3)
-
-    assert isinstance(result, _Wrapped)
-    assert result.value == 8
-
-
-def test_wrap_method_passes_through_not_implemented() -> None:
-    def raw_not_implemented(self: _Wrapped, other: int) -> Any:
-        return NotImplemented
-
-    wrapped_method = wrap_method(raw_not_implemented)
-    wrapped = _Wrapped(5)
-
-    assert wrapped_method(wrapped, 3) is NotImplemented

tomlkit/_types.py

@@ -12,7 +12,6 @@
     "_CustomFloat",
     "_CustomInt",
     "_CustomList",
-    "wrap_method",
 ]
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -31,13 +30,8 @@
     from builtins import float as _CustomFloat
     from builtins import int as _CustomInt
     from builtins import list as _CustomList
-    from typing import Callable
-    from typing import Concatenate
-    from typing import ParamSpec
     from typing import Protocol
 
-    P = ParamSpec("P")
-
     class WrapperType(Protocol):
         def _new(self: WT, value: Any) -> WT: ...
 
@@ -76,15 +70,3 @@ class _CustomInt(Integral, int):
 
     class _CustomFloat(Real, float):
         """Adds Real mixin while pretending to be a builtin float"""
-
-
-def wrap_method(
-    original_method: Callable[Concatenate[WT, P], Any],
-) -> Callable[Concatenate[WT, P], Any]:
-    def wrapper(self: WT, /, *args: P.args, **kwargs: P.kwargs) -> Any:
-        result = original_method(self, *args, **kwargs)
-        if result is NotImplemented:
-            return result
-        return self._new(result)
-
-    return wrapper