fix: tweak typing for merge implementation

mcbeet · Jan 10, 2021 · 8efa444 · 8efa444
1 parent eb3eaf7
commit 8efa444
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/beet/core/container.py b/beet/core/container.py
@@ -34,17 +34,17 @@
 
 K = TypeVar("K")
 V = TypeVar("V")
-MergeableType = TypeVar("MergeableType", bound="SupportsMerge[Any]")
+MergeableType = TypeVar("MergeableType", bound="SupportsMerge")
 ProxyKeyType = TypeVar("ProxyKeyType")
 
 PinDefault = Union[V, Sentinel]
 PinDefaultFactory = Union[Callable[[], V], Sentinel]
 
 
-class SupportsMerge(Protocol[V]):
+class SupportsMerge(Protocol):
     """Protocol for detecting mergeable types."""
 
-    def merge(self: V, other: V) -> bool:
+    def merge(self, other: Any) -> bool:
         ...
 
 

diff --git a/beet/library/data_pack.py b/beet/library/data_pack.py
@@ -133,7 +133,7 @@ class TagFile(JsonFile, NamespaceFile):
 
     extension = ".json"
 
-    def merge(self: TagFileType, other: TagFileType) -> bool:
+    def merge(self: TagFileType, other: TagFileType) -> bool:  # type: ignore
         if other.data.get("replace"):
             self.data["replace"] = True