From c499b6339d0b2468411ea4004b548b35550b4012 Mon Sep 17 00:00:00 2001
From: AlexWaygood <alex.waygood@gmail.com>
Date: Tue, 14 Jun 2022 13:18:36 +0100
Subject: [PATCH] `cachetools`: Fix invalid `TypeVar` usage

---
 stubs/cachetools/cachetools/__init__.pyi | 49 +++++++++++++++---------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/stubs/cachetools/cachetools/__init__.pyi b/stubs/cachetools/cachetools/__init__.pyi
index c3e6d95ffef2..eea24f3f640f 100644
--- a/stubs/cachetools/cachetools/__init__.pyi
+++ b/stubs/cachetools/cachetools/__init__.pyi
@@ -11,7 +11,10 @@ _VT = TypeVar("_VT")
 _T = TypeVar("_T")
 
 class Cache(MutableMapping[_KT, _VT], Generic[_KT, _VT]):
-    def __init__(self, maxsize: float, getsizeof: Callable[[_VT], float] | None = ...) -> None: ...
+    @overload
+    def __init__(self, maxsize: float, getsizeof: Callable[[_VT], float]) -> None: ...
+    @overload
+    def __init__(self, maxsize: float, getsizeof: None = ...) -> None: ...
     def __getitem__(self, key: _KT) -> _VT: ...
     def __setitem__(self, key: _KT, value: _VT) -> None: ...
     def __delitem__(self, key: _KT) -> None: ...
@@ -30,29 +33,32 @@ class Cache(MutableMapping[_KT, _VT], Generic[_KT, _VT]):
     @staticmethod
     def getsizeof(value: _VT) -> float: ...
 
-class FIFOCache(Cache[_KT, _VT]):
-    def __init__(self, maxsize: float, getsizeof: Callable[[_VT], float] | None = ...) -> None: ...
-
-class LFUCache(Cache[_KT, _VT]):
-    def __init__(self, maxsize: float, getsizeof: Callable[[_VT], float] | None = ...) -> None: ...
-
-class LRUCache(Cache[_KT, _VT]):
-    def __init__(self, maxsize: float, getsizeof: Callable[[_VT], float] | None = ...) -> None: ...
-
-class MRUCache(Cache[_KT, _VT]):
-    def __init__(self, maxsize: float, getsizeof: Callable[[_VT], float] | None = ...) -> None: ...
+class FIFOCache(Cache[_KT, _VT]): ...
+class LFUCache(Cache[_KT, _VT]): ...
+class LRUCache(Cache[_KT, _VT]): ...
+class MRUCache(Cache[_KT, _VT]): ...
 
 class RRCache(Cache[_KT, _VT]):
-    def __init__(
-        self, maxsize: float, choice: Callable[[Sequence[_KT]], _KT] | None = ..., getsizeof: Callable[[_VT], float] | None = ...
-    ) -> None: ...
+    @overload
+    def __init__(self, maxsize: float, choice: None = ..., getsizeof: None = ...) -> None: ...
+    @overload
+    def __init__(self, maxsize: float, *, getsizeof: Callable[[_VT], float]) -> None: ...
+    @overload
+    def __init__(self, maxsize: float, choice: None, getsizeof: Callable[[_VT], float]) -> None: ...
+    @overload
+    def __init__(self, maxsize: float, choice: Callable[[Sequence[_KT]], _KT], getsizeof: None = ...) -> None: ...
+    @overload
+    def __init__(self, maxsize: float, choice: Callable[[Sequence[_KT]], _KT], getsizeof: Callable[[_VT], float]) -> None: ...
     @property
     def choice(self) -> Callable[[Sequence[_KT]], _KT]: ...
 
 class _TimedCache(Cache[_KT, _VT]):
-    def __init__(
-        self, maxsize: float, timer: Callable[[], float] = ..., getsizeof: Callable[[_VT], float] | None = ...
-    ) -> None: ...
+    @overload
+    def __init__(self, maxsize: float, timer: Callable[[], float] = ..., getsizeof: None = ...) -> None: ...
+    @overload
+    def __init__(self, maxsize: float, timer: Callable[[], float], getsizeof: Callable[[_VT], float]) -> None: ...
+    @overload
+    def __init__(self, maxsize: float, timer: Callable[[], float] = ..., *, getsizeof: Callable[[_VT], float]) -> None: ...
     @property
     def currsize(self) -> float: ...
 
@@ -66,8 +72,13 @@ class _TimedCache(Cache[_KT, _VT]):
     def timer(self) -> _Timer: ...
 
 class TTLCache(_TimedCache[_KT, _VT]):
+    @overload
+    def __init__(self, maxsize: float, ttl: float, timer: Callable[[], float] = ..., getsizeof: None = ...) -> None: ...
+    @overload
+    def __init__(self, maxsize: float, ttl: float, timer: Callable[[], float], getsizeof: Callable[[_VT], float]) -> None: ...
+    @overload
     def __init__(
-        self, maxsize: float, ttl: float, timer: Callable[[], float] = ..., getsizeof: Callable[[_VT], float] | None = ...
+        self, maxsize: float, ttl: float, timer: Callable[[], float] = ..., *, getsizeof: Callable[[_VT], float]
     ) -> None: ...
     @property
     def ttl(self) -> float: ...