update CacheControl stubs via psf/cachecontrol#279 (#599)

Author: mr-c

mypy-stubs/cachecontrol/cache.pyi

@@ -1,5 +1,5 @@
 class BaseCache:
-    def get(self, key: str) -> str | None: ...
-    def set(self, key: str, value: str) -> None: ...
+    def get(self, key: str) -> bytes | None: ...
+    def set(self, key: str, value: bytes, expires: int | None = None) -> None: ...
     def delete(self, key: str) -> None: ...
     def close(self) -> None: ...

mypy-stubs/cachecontrol/caches/file_cache.pyi

@@ -10,11 +10,11 @@ class _LockClass:
 _lock_class = ContextManager[_LockClass]
 
 class FileCache(BaseCache):
-    directory: str | PathLike[str]
+    directory: str
     forever: bool
-    filemode: str
-    dirmode: str
-    lock_class: _lock_class
+    filemode: int
+    dirmode: int
+    lock_class: _lock_class | None = None
     def __init__(
         self,
         directory: str | PathLike[str],
@@ -26,6 +26,6 @@ class FileCache(BaseCache):
     ) -> None: ...
     @staticmethod
     def encode(x: str) -> str: ...
-    def get(self, key: str) -> None | str: ...
-    def set(self, key: str, value: str) -> None: ...
+    def get(self, key: str) -> None | bytes: ...
+    def set(self, key: str, value: bytes, expires: int | None = None) -> None: ...
     def delete(self, key: str) -> None: ...

mypy-stubs/cachecontrol/controller.pyi

@@ -1,17 +1,18 @@
+from typing import Collection
+
 from _typeshed import Incomplete
 
-logger: Incomplete
-URI: Incomplete
+from .cache import BaseCache
 
 class CacheController:
-    cache: Incomplete
-    cache_etags: Incomplete
+    cache: BaseCache
+    cache_etags: bool
     serializer: Incomplete
-    cacheable_status_codes: Incomplete
+    cacheable_status_codes: Collection[int] | None = None
     def __init__(
         self,
-        cache: Incomplete | None = ...,
-        cache_etags: bool = ...,
-        serializer: Incomplete | None = ...,
-        status_codes: Incomplete | None = ...,
+        cache: BaseCache | None = None,
+        cache_etags: bool = True,
+        serializer: Incomplete | None = None,
+        status_codes: Collection[int] | None = None,
     ) -> None: ...

mypy-stubs/cachecontrol/wrapper.pyi

@@ -1,13 +1,18 @@
+from typing import Collection, Type
+
 from _typeshed import Incomplete
 from requests import Session
 
+from .cache import BaseCache
+from .controller import CacheController
+
 def CacheControl(
     sess: Session,
-    cache: Incomplete | None = ...,
-    cache_etags: bool = ...,
-    serializer: Incomplete | None = ...,
-    heuristic: Incomplete | None = ...,
-    controller_class: Incomplete | None = ...,
-    adapter_class: Incomplete | None = ...,
-    cacheable_methods: Incomplete | None = ...,
+    cache: BaseCache | None = None,
+    cache_etags: bool = True,
+    serializer: Incomplete | None = None,
+    heuristic: Incomplete | None = None,
+    controller_class: Type[CacheController] | None = None,
+    adapter_class: Incomplete | None = None,
+    cacheable_methods: Collection[str] | None = None,
 ) -> Session: ...