AlexWaygood · Mar 8, 2022 · Mar 7, 2022 · Mar 7, 2022 · Mar 7, 2022 · Mar 7, 2022
diff --git a/stubs/cachetools/@tests/stubtest_allowlist.txt b/stubs/cachetools/@tests/stubtest_allowlist.txt
@@ -1,7 +1,22 @@
 cachetools.Cache.get
-cachetools.cache.Cache.get
 
-# it looks like cachetools stubs are really out of date, so none of the modules
-# referenced exist anymore
-cachetools\..*\.__(get|set|del)item__  # has extra argument
-cachetools\..*TTLCache.__repr__
+# stubs omit defaulted arguments that are meant to be optimizations, not provided by user
+cachetools.FIFOCache.__delitem__
+cachetools.FIFOCache.__setitem__
+cachetools.LFUCache.__delitem__
+cachetools.LFUCache.__getitem__
+cachetools.LFUCache.__setitem__
+cachetools.LRUCache.__delitem__
+cachetools.LRUCache.__getitem__
+cachetools.LRUCache.__setitem__
+cachetools.MRUCache.__delitem__
+cachetools.MRUCache.__getitem__
+cachetools.MRUCache.__setitem__
+cachetools.TLRUCache.__delitem__
+cachetools.TLRUCache.__getitem__
+cachetools.TLRUCache.__setitem__
+cachetools.TTLCache.__delitem__
+cachetools.TTLCache.__getitem__
+cachetools.TTLCache.__setitem__
+cachetools._TimedCache.__len__
+cachetools._TimedCache.__repr__
diff --git a/stubs/cachetools/METADATA.toml b/stubs/cachetools/METADATA.toml
@@ -1 +1 @@
-version = "4.2.*"
+version = "5.0.*"
diff --git a/stubs/cachetools/cachetools/__init__.pyi b/stubs/cachetools/cachetools/__init__.pyi
@@ -3,6 +3,9 @@ from collections.abc import Iterator, Sequence
 from contextlib import AbstractContextManager
 from typing import Any, Callable, Generic, MutableMapping, TypeVar, overload
 
+__all__ = ("Cache", "FIFOCache", "LFUCache", "LRUCache", "MRUCache", "RRCache", "TLRUCache", "TTLCache", "cached", "cachedmethod")
+__version__: str
+
 _KT = TypeVar("_KT")
 _VT = TypeVar("_VT")
 _T = TypeVar("_T")
@@ -12,6 +15,7 @@ class Cache(MutableMapping[_KT, _VT], Generic[_KT, _VT]):
     def __getitem__(self, key: _KT) -> _VT: ...
     def __setitem__(self, key: _KT, value: _VT) -> None: ...
     def __delitem__(self, key: _KT) -> None: ...
+    def __missing__(self, key: _KT) -> _VT: ...
     def __iter__(self) -> Iterator[_KT]: ...
     def __len__(self) -> int: ...
     @overload  # type: ignore[override]
@@ -45,18 +49,42 @@ class RRCache(Cache[_KT, _VT]):
     @property
     def choice(self) -> Callable[[Sequence[_KT]], _KT]: ...
 
-class TTLCache(Cache[_KT, _VT]):
+class _TimedCache(Cache[_KT, _VT]):
     def __init__(
-        self, maxsize: float, ttl: float, timer: Callable[[], float] = ..., getsizeof: Callable[[_VT], float] | None = ...
+        self, maxsize: float, timer: Callable[[], float] = ..., getsizeof: Callable[[_VT], float] | None = ...
     ) -> None: ...
     @property
     def currsize(self) -> float: ...
+
+    class _Timer:
+        def __init__(self, timer: Callable[[], float]) -> None: ...
+        def __call__(self) -> float: ...
+        def __enter__(self) -> float: ...
+        def __exit__(self, *exc: object) -> None: ...
+
     @property
-    def timer(self) -> Callable[[], float]: ...
+    def timer(self) -> _Timer: ...
+
+class TTLCache(_TimedCache[_KT, _VT]):
+    def __init__(
+        self, maxsize: float, ttl: float, timer: Callable[[], float] = ..., getsizeof: Callable[[_VT], float] | None = ...
+    ) -> None: ...
     @property
     def ttl(self) -> float: ...
     def expire(self, time: float | None = ...) -> None: ...
 
+class TLRUCache(_TimedCache[_KT, _VT]):
+    def __init__(
+        self,
+        maxsize: float,
+        ttu: Callable[[_KT, _VT, float], float],
+        timer: Callable[[], float] = ...,
+        getsizeof: Callable[[_VT], float] | None = ...,
+    ) -> None: ...
+    @property
+    def ttu(self) -> Callable[[_KT, _VT, float], float]: ...
+    def expire(self, time: float | None = ...) -> None: ...
+
 def cached(
     cache: MutableMapping[_KT, Any] | None, key: Callable[..., _KT] = ..., lock: AbstractContextManager[Any] | None = ...
 ) -> IdentityFunction: ...

diff --git a/stubs/cachetools/cachetools/cache.pyi b/stubs/cachetools/cachetools/cache.pyi
diff --git a/stubs/cachetools/cachetools/fifo.pyi b/stubs/cachetools/cachetools/fifo.pyi
diff --git a/stubs/cachetools/cachetools/func.pyi b/stubs/cachetools/cachetools/func.pyi
@@ -1,6 +1,7 @@
 from _typeshed import IdentityFunction
 from typing import Callable, Sequence, TypeVar
 
+__all__ = ("fifo_cache", "lfu_cache", "lru_cache", "mru_cache", "rr_cache", "ttl_cache")
 _T = TypeVar("_T")
 
 def fifo_cache(maxsize: float | None = ..., typed: bool = ...) -> IdentityFunction: ...

diff --git a/stubs/cachetools/cachetools/keys.pyi b/stubs/cachetools/cachetools/keys.pyi
@@ -1,4 +1,6 @@
 from typing import Hashable
 
+__all__ = ("hashkey", "typedkey")
+
 def hashkey(*args: Hashable, **kwargs: Hashable) -> tuple[Hashable, ...]: ...
 def typedkey(*args: Hashable, **kwargs: Hashable) -> tuple[Hashable, ...]: ...
diff --git a/stubs/cachetools/cachetools/lfu.pyi b/stubs/cachetools/cachetools/lfu.pyi
diff --git a/stubs/cachetools/cachetools/lru.pyi b/stubs/cachetools/cachetools/lru.pyi
diff --git a/stubs/cachetools/cachetools/mru.pyi b/stubs/cachetools/cachetools/mru.pyi
diff --git a/stubs/cachetools/cachetools/rr.pyi b/stubs/cachetools/cachetools/rr.pyi
diff --git a/stubs/cachetools/cachetools/ttl.pyi b/stubs/cachetools/cachetools/ttl.pyi