From d1d87f0d8789f4bdb47f3f7fc8e3b53cb9f8c946 Mon Sep 17 00:00:00 2001
From: hasier <hasier@users.noreply.github.com>
Date: Tue, 5 Jul 2022 12:59:35 +0100
Subject: [PATCH] Improve passlib CryptContext typing (#8237)

---
 stubs/passlib/passlib/context.pyi | 49 +++++++++++++++++++------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/stubs/passlib/passlib/context.pyi b/stubs/passlib/passlib/context.pyi
index 54120e630..2a394d141 100644
--- a/stubs/passlib/passlib/context.pyi
+++ b/stubs/passlib/passlib/context.pyi
@@ -1,3 +1,4 @@
+from _typeshed import Self, StrOrBytesPath, SupportsItems
 from typing import Any
 
 class CryptPolicy:
@@ -25,24 +26,30 @@ class CryptPolicy:
 
 class CryptContext:
     @classmethod
-    def from_string(cls, source, section: str = ..., encoding: str = ...): ...
+    def from_string(cls: type[Self], source: str | bytes, section: str = ..., encoding: str = ...) -> Self: ...
     @classmethod
-    def from_path(cls, path, section: str = ..., encoding: str = ...): ...
-    def copy(self, **kwds): ...
-    def using(self, **kwds): ...
+    def from_path(cls: type[Self], path: StrOrBytesPath, section: str = ..., encoding: str = ...) -> Self: ...
+    def copy(self, **kwds: Any) -> CryptContext: ...
+    def using(self, **kwds: Any) -> CryptContext: ...
     def replace(self, **kwds): ...
     def __init__(self, schemes: Any | None = ..., policy=..., _autoload: bool = ..., **kwds) -> None: ...
-    policy: Any
-    def load_path(self, path, update: bool = ..., section: str = ..., encoding: str = ...): ...
-    def load(self, source, update: bool = ..., section: str = ..., encoding: str = ...) -> None: ...
-    def update(self, *args, **kwds) -> None: ...
+    policy: CryptPolicy
+    def load_path(self, path: StrOrBytesPath, update: bool = ..., section: str = ..., encoding: str = ...) -> None: ...
+    def load(
+        self,
+        source: str | bytes | SupportsItems[str, Any] | CryptContext,
+        update: bool = ...,
+        section: str = ...,
+        encoding: str = ...,
+    ) -> None: ...
+    def update(self, *args: Any, **kwds: Any) -> None: ...
     def schemes(self, resolve: bool = ..., category: Any | None = ..., unconfigured: bool = ...): ...
     def default_scheme(self, category: Any | None = ..., resolve: bool = ..., unconfigured: bool = ...): ...
     def handler(self, scheme: Any | None = ..., category: Any | None = ..., unconfigured: bool = ...): ...
     @property
     def context_kwds(self): ...
-    def to_dict(self, resolve: bool = ...): ...
-    def to_string(self, section: str = ...): ...
+    def to_dict(self, resolve: bool = ...) -> dict[str, Any]: ...
+    def to_string(self, section: str = ...) -> str: ...
     mvt_estimate_max_samples: int
     mvt_estimate_min_samples: int
     mvt_estimate_max_time: int
@@ -50,20 +57,26 @@ class CryptContext:
     harden_verify: Any
     min_verify_time: int
     def reset_min_verify_time(self) -> None: ...
-    def needs_update(self, hash, scheme: Any | None = ..., category: Any | None = ..., secret: Any | None = ...): ...
+    def needs_update(
+        self, hash: str | bytes, scheme: str | None = ..., category: str | None = ..., secret: str | bytes | None = ...
+    ) -> bool: ...
     def hash_needs_update(self, hash, scheme: Any | None = ..., category: Any | None = ...): ...
     def genconfig(self, scheme: Any | None = ..., category: Any | None = ..., **settings): ...
     def genhash(self, secret, config, scheme: Any | None = ..., category: Any | None = ..., **kwds): ...
     def identify(self, hash, category: Any | None = ..., resolve: bool = ..., required: bool = ..., unconfigured: bool = ...): ...
-    def hash(self, secret, scheme: Any | None = ..., category: Any | None = ..., **kwds): ...
+    def hash(self, secret: str | bytes, scheme: str | None = ..., category: str | None = ..., **kwds: Any) -> str: ...
     def encrypt(self, *args, **kwds): ...
-    def verify(self, secret, hash, scheme: Any | None = ..., category: Any | None = ..., **kwds): ...
-    def verify_and_update(self, secret, hash, scheme: Any | None = ..., category: Any | None = ..., **kwds): ...
+    def verify(
+        self, secret: str | bytes, hash: str | bytes, scheme: str | None = ..., category: str | None = ..., **kwds: Any
+    ) -> bool: ...
+    def verify_and_update(
+        self, secret: str | bytes, hash: str | bytes, scheme: str | None = ..., category: str | None = ..., **kwds: Any
+    ) -> tuple[bool, str | None]: ...
     def dummy_verify(self, elapsed: int = ...): ...
-    def is_enabled(self, hash): ...
-    def disable(self, hash: Any | None = ...): ...
-    def enable(self, hash): ...
+    def is_enabled(self, hash: str | bytes) -> bool: ...
+    def disable(self, hash: str | bytes | None = ...) -> str: ...
+    def enable(self, hash: str | bytes) -> str: ...
 
 class LazyCryptContext(CryptContext):
     def __init__(self, schemes: Any | None = ..., **kwds) -> None: ...
-    def __getattribute__(self, attr): ...
+    def __getattribute__(self, attr: str) -> Any: ...