Merge pull request #163 from Tenzer/typing-optional-arguments

Fix minor issues with type annotations

Author: maxbachmann

src/rapidfuzz/fuzz.pyi

@@ -6,50 +6,50 @@ S2 = TypeVar("S2")
 
 def ratio(
     s1: S1, s2: S2, *,
-    processor: Optional[Callable[[Union[S1, S2]], _StringType]],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     score_cutoff: Optional[float] = 0) -> float: ...
 
 def partial_ratio(
     s1: S1, s2: S2, *,
-    processor: Optional[Callable[[Union[S1, S2]]], _StringType],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     score_cutoff: Optional[float] = 0) -> float: ...
 
 def token_sort_ratio(
     s1: S1, s2: S2, *,
-    processor: Optional[Callable[[Union[S1, S2]], _StringType]],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     score_cutoff: Optional[float] = 0) -> float: ...
 
 def token_set_ratio(
     s1: S1, s2: S2, *,
-    processor: Optional[Callable[[Union[S1, S2]], _StringType]],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     score_cutoff: Optional[float] = 0) -> float: ...
 
 def token_ratio(
     s1: S1, s2: S2, *,
-    processor: Optional[Callable[[Union[S1, S2]], _StringType]],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     score_cutoff: Optional[float] = 0) -> float: ...
 
 def partial_token_sort_ratio(
     s1: S1, s2: S2, *,
-    processor: Optional[Callable[[Union[S1, S2]], _StringType]],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     score_cutoff: Optional[float] = 0) -> float: ...
 
 def partial_token_set_ratio(
     s1: S1, s2: S2, *,
-    processor: Optional[Callable[[Union[S1, S2]], _StringType]],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     score_cutoff: Optional[float] = 0) -> float: ...
 
 def partial_token_ratio(
     s1: S1, s2: S2, *,
-    processor: Optional[Callable[[Union[S1, S2]], _StringType]],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     score_cutoff: Optional[float] = 0) -> float: ...
 
 def WRatio(
     s1: S1, s2: S2, *,
-    processor: Optional[Callable[[Union[S1, S2]], _StringType]],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     score_cutoff: Optional[float] = 0) -> float: ...
 
 def QRatio(
     s1: S1, s2: S2, *,
-    processor: Optional[Callable[[Union[S1, S2]], _StringType]],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     score_cutoff: Optional[float] = 0) -> float: ...

src/rapidfuzz/string_metric.pyi

@@ -1,4 +1,4 @@
-from typing import Callable, Hashable, Sequence, Optional, Union, TypeVar, Tuple
+from typing import Callable, Hashable, Sequence, Optional, Union, TypeVar, Tuple, List
 
 _StringType = Sequence[Hashable]
 S1 = TypeVar("S1")
@@ -7,36 +7,36 @@ S2 = TypeVar("S2")
 def levenshtein(
     s1: S1, s2: S2, *,
     weights: Optional[Tuple[int, int, int]] = (1,1,1),
-    processor: Optional[Callable[[Union[S1, S2]]], _StringType],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     max: Optional[int] = None) -> int: ...
 
 def normalized_levenshtein(
     s1: S1, s2: S2, *,
     weights: Optional[Tuple[int, int, int]] = (1,1,1),
-    processor: Optional[Callable[[Union[S1, S2]]], _StringType],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     score_cutoff: Optional[float] = 0) -> float: ...
 
 def levenshtein_editops(
     s1: S1, s2: S2, *,
-    processor: Optional[Callable[[Union[S1, S2]]], _StringType]) -> List[Tuple[str, int, int]]: ...
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...) -> List[Tuple[str, int, int]]: ...
 
 def hamming(
     s1: S1, s2: S2, *,
-    processor: Optional[Callable[[Union[S1, S2]]], _StringType],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     max: Optional[int] = None) -> int: ...
 
 def normalized_hamming(
     s1: S1, s2: S2, *,
-    processor: Optional[Callable[[Union[S1, S2]]], _StringType],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     score_cutoff: Optional[float] = 0) -> float: ...
 
 def jaro_similarity(
     s1: S1, s2: S2, *,
-    processor: Optional[Callable[[Union[S1, S2]]], _StringType],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     score_cutoff: Optional[float] = 0) -> float: ...
 
 def jaro_winkler_similarity(
     s1: S1, s2: S2, *,
     prefix_weight: float = 0.1,
-    processor: Optional[Callable[[Union[S1, S2]]], _StringType],
+    processor: Optional[Callable[[Union[S1, S2]], _StringType]] = ...,
     score_cutoff: Optional[float] = 0) -> float: ...