More fun: object -> Any to allow more restrictive __diff__ implementa…

…tions.
Julian · Dec 30, 2023 · 41e4cda · 41e4cda
1 parent d7d0204
commit 41e4cda
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/diff/_diff.py b/diff/_diff.py
@@ -1,5 +1,5 @@
 from difflib import ndiff
-from typing import Protocol, TypeVar, overload, runtime_checkable
+from typing import Any, Protocol, TypeVar, overload, runtime_checkable
 
 from attrs import field, frozen
 
@@ -22,7 +22,7 @@ def explain(self) -> str:
 
 @runtime_checkable
 class Diffable(Protocol[D_co]):
-    def __diff__(self, other: object) -> D_co:
+    def __diff__(self, other: Any) -> D_co:
         ...
 
 
@@ -35,7 +35,7 @@ def explain(self) -> str:
 
 
 @overload
-def diff(one: Diffable[D_co], two: object) -> D_co | None:
+def diff(one: Diffable[D_co], two: Any) -> D_co | None:
     ...
 
 

diff --git a/diff/tests/typing/check_me_pyright.py b/diff/tests/typing/check_me_pyright.py
@@ -14,3 +14,12 @@ def __diff__(self, other: object) -> ConcreteDifference:
 
 
 difference: ConcreteDifference | None = diff(Something(), Something())
+
+
+class PartiallyDiffable:
+    def __diff__(self, other: PartiallyDiffable) -> ConcreteDifference:
+        return ConcreteDifference()
+
+
+partially = PartiallyDiffable()
+difference: ConcreteDifference | None = diff(partially, partially)