Fix #393: Improve ambiguous overloads for decorators.

Author: tkem

src/cachetools/__init__.pyi

@@ -168,16 +168,25 @@ def cached(
     key: Callable[..., _KT] = ...,
     lock: AbstractContextManager[Any] | None = None,
     condition: _AbstractCondition | None = None,
-    info: Literal[True] = ...,
-) -> Callable[[Callable[..., _R]], _cached_wrapper_info[_R]]: ...
+    info: Literal[False] = ...,
+) -> Callable[[Callable[..., _R]], _cached_wrapper[_R]]: ...
 @overload
 def cached(
     cache: MutableMapping[_KT, Any] | None,
     key: Callable[..., _KT] = ...,
     lock: AbstractContextManager[Any] | None = None,
     condition: _AbstractCondition | None = None,
-    info: Literal[False] = ...,
-) -> Callable[[Callable[..., _R]], _cached_wrapper[_R]]: ...
+    *,
+    info: Literal[True],
+) -> Callable[[Callable[..., _R]], _cached_wrapper_info[_R]]: ...
+@overload
+def cached(
+    cache: MutableMapping[_KT, Any] | None,
+    key: Callable[..., _KT],
+    lock: AbstractContextManager[Any] | None,
+    condition: _AbstractCondition | None,
+    info: Literal[True],
+) -> Callable[[Callable[..., _R]], _cached_wrapper_info[_R]]: ...
 
 @type_check_only
 class _cachedmethod_wrapper(Generic[_R]):
@@ -201,13 +210,22 @@ def cachedmethod(
     key: Callable[..., _KT] = ...,
     lock: Callable[[Any], AbstractContextManager[Any]] | None = None,
     condition: Callable[[Any], _AbstractCondition] | None = None,
-    info: Literal[True] = ...,
-) -> Callable[[Callable[..., _R]], _cachedmethod_wrapper_info[_R]]: ...
+    info: Literal[False] = ...,
+) -> Callable[[Callable[..., _R]], _cachedmethod_wrapper[_R]]: ...
 @overload
 def cachedmethod(
     cache: Callable[[Any], MutableMapping[_KT, Any]],
     key: Callable[..., _KT] = ...,
     lock: Callable[[Any], AbstractContextManager[Any]] | None = None,
     condition: Callable[[Any], _AbstractCondition] | None = None,
-    info: Literal[False] = ...,
-) -> Callable[[Callable[..., _R]], _cachedmethod_wrapper[_R]]: ...
+    *,
+    info: Literal[True],
+) -> Callable[[Callable[..., _R]], _cachedmethod_wrapper_info[_R]]: ...
+@overload
+def cachedmethod(
+    cache: Callable[[Any], MutableMapping[_KT, Any]],
+    key: Callable[..., _KT],
+    lock: Callable[[Any], AbstractContextManager[Any]] | None,
+    condition: Callable[[Any], _AbstractCondition] | None,
+    info: Literal[True],
+) -> Callable[[Callable[..., _R]], _cachedmethod_wrapper_info[_R]]: ...