Replace Incomplete | None = None in third party stubs (#14063)

Author: srittau

pyrightconfig.stricter.json

@@ -24,7 +24,7 @@
         "stdlib/tkinter/scrolledtext.pyi",
         "stdlib/tkinter/tix.pyi",
         "stdlib/tkinter/ttk.pyi",
-        "stubs/aiofiles/aiofiles/tempfile/temptypes.pyi",
+        "stubs/aiofiles",
         "stubs/antlr4-python3-runtime",
         "stubs/auth0-python",
         "stubs/Authlib",
@@ -62,13 +62,16 @@
         "stubs/ldap3",
         "stubs/m3u8",
         "stubs/Markdown",
+        "stubs/mock/mock/mock.pyi",
         "stubs/mysqlclient",
         "stubs/netaddr/netaddr/core.pyi",
         "stubs/netaddr/netaddr/ip/__init__.pyi",
         "stubs/netaddr/netaddr/ip/iana.pyi",
         "stubs/networkx",
         "stubs/oauthlib",
         "stubs/openpyxl",
+        "stubs/opentracing/opentracing/span.pyi",
+        "stubs/paramiko/paramiko/_winapi.pyi",
         "stubs/parsimonious/parsimonious/nodes.pyi",
         "stubs/passlib",
         "stubs/peewee",
@@ -86,6 +89,7 @@
         "stubs/python-dateutil",
         "stubs/python-http-client",
         "stubs/python-jose",
+        "stubs/pytz/pytz/lazy.pyi",
         "stubs/pywin32",
         "stubs/pyxdg",
         "stubs/PyYAML",

stubs/Authlib/authlib/integrations/base_client/async_app.pyi

@@ -1,16 +1,14 @@
-from _typeshed import Incomplete
-
 from authlib.integrations.base_client.sync_app import OAuth1Base, OAuth2Base
 
 __all__ = ["AsyncOAuth1Mixin", "AsyncOAuth2Mixin"]
 
 class AsyncOAuth1Mixin(OAuth1Base):
-    async def request(self, method, url, token: Incomplete | None = None, **kwargs): ...
-    async def create_authorization_url(self, redirect_uri: Incomplete | None = None, **kwargs): ...
-    async def fetch_access_token(self, request_token: Incomplete | None = None, **kwargs): ...
+    async def request(self, method, url, token=None, **kwargs): ...
+    async def create_authorization_url(self, redirect_uri=None, **kwargs): ...
+    async def fetch_access_token(self, request_token=None, **kwargs): ...
 
 class AsyncOAuth2Mixin(OAuth2Base):
     async def load_server_metadata(self): ...
-    async def request(self, method, url, token: Incomplete | None = None, **kwargs): ...
-    async def create_authorization_url(self, redirect_uri: Incomplete | None = None, **kwargs): ...
-    async def fetch_access_token(self, redirect_uri: Incomplete | None = None, **kwargs): ...
+    async def request(self, method, url, token=None, **kwargs): ...
+    async def create_authorization_url(self, redirect_uri=None, **kwargs): ...
+    async def fetch_access_token(self, redirect_uri=None, **kwargs): ...

stubs/Authlib/authlib/integrations/base_client/async_openid.pyi

@@ -1,8 +1,6 @@
-from _typeshed import Incomplete
-
 __all__ = ["AsyncOpenIDMixin"]
 
 class AsyncOpenIDMixin:
     async def fetch_jwk_set(self, force: bool = False): ...
     async def userinfo(self, **kwargs): ...
-    async def parse_id_token(self, token, nonce, claims_options: Incomplete | None = None): ...
+    async def parse_id_token(self, token, nonce, claims_options=None): ...

stubs/Authlib/authlib/integrations/base_client/framework_integration.pyi

@@ -4,10 +4,10 @@ class FrameworkIntegration:
     expires_in: int
     name: Incomplete
     cache: Incomplete
-    def __init__(self, name, cache: Incomplete | None = None) -> None: ...
+    def __init__(self, name, cache=None) -> None: ...
     def get_state_data(self, session, state): ...
     def set_state_data(self, session, state, data): ...
     def clear_state_data(self, session, state): ...
-    def update_token(self, token, refresh_token: Incomplete | None = None, access_token: Incomplete | None = None) -> None: ...
+    def update_token(self, token, refresh_token=None, access_token=None) -> None: ...
     @staticmethod
     def load_config(oauth, name, params) -> None: ...

stubs/Authlib/authlib/integrations/base_client/registry.pyi

@@ -11,9 +11,7 @@ class BaseOAuth:
     cache: Incomplete
     fetch_token: Incomplete
     update_token: Incomplete
-    def __init__(
-        self, cache: Incomplete | None = None, fetch_token: Incomplete | None = None, update_token: Incomplete | None = None
-    ) -> None: ...
+    def __init__(self, cache=None, fetch_token=None, update_token=None) -> None: ...
     def create_client(self, name): ...
     def register(self, name, overwrite: bool = False, **kwargs): ...
     def generate_client_kwargs(self, name, overwrite, **kwargs): ...

stubs/Authlib/authlib/integrations/base_client/sync_app.pyi

@@ -3,7 +3,7 @@ from _typeshed import Incomplete
 class BaseApp:
     client_cls: Incomplete
     OAUTH_APP_CONFIG: Incomplete
-    def request(self, method, url, token: Incomplete | None = None, **kwargs): ...
+    def request(self, method, url, token=None, **kwargs): ...
     def get(self, url, **kwargs): ...
     def post(self, url, **kwargs): ...
     def patch(self, url, **kwargs): ...
@@ -29,26 +29,26 @@ class OAuth1Base:
     def __init__(
         self,
         framework,
-        name: Incomplete | None = None,
-        fetch_token: Incomplete | None = None,
-        client_id: Incomplete | None = None,
-        client_secret: Incomplete | None = None,
-        request_token_url: Incomplete | None = None,
-        request_token_params: Incomplete | None = None,
-        access_token_url: Incomplete | None = None,
-        access_token_params: Incomplete | None = None,
-        authorize_url: Incomplete | None = None,
-        authorize_params: Incomplete | None = None,
-        api_base_url: Incomplete | None = None,
-        client_kwargs: Incomplete | None = None,
-        user_agent: Incomplete | None = None,
+        name=None,
+        fetch_token=None,
+        client_id=None,
+        client_secret=None,
+        request_token_url=None,
+        request_token_params=None,
+        access_token_url=None,
+        access_token_params=None,
+        authorize_url=None,
+        authorize_params=None,
+        api_base_url=None,
+        client_kwargs=None,
+        user_agent=None,
         **kwargs,
     ) -> None: ...
 
 class OAuth1Mixin(_RequestMixin, OAuth1Base):
-    def request(self, method, url, token: Incomplete | None = None, **kwargs): ...
-    def create_authorization_url(self, redirect_uri: Incomplete | None = None, **kwargs): ...
-    def fetch_access_token(self, request_token: Incomplete | None = None, **kwargs): ...
+    def request(self, method, url, token=None, **kwargs): ...
+    def create_authorization_url(self, redirect_uri=None, **kwargs): ...
+    def fetch_access_token(self, request_token=None, **kwargs): ...
 
 class OAuth2Base:
     client_cls: Incomplete
@@ -68,26 +68,26 @@ class OAuth2Base:
     def __init__(
         self,
         framework,
-        name: Incomplete | None = None,
-        fetch_token: Incomplete | None = None,
-        update_token: Incomplete | None = None,
-        client_id: Incomplete | None = None,
-        client_secret: Incomplete | None = None,
-        access_token_url: Incomplete | None = None,
-        access_token_params: Incomplete | None = None,
-        authorize_url: Incomplete | None = None,
-        authorize_params: Incomplete | None = None,
-        api_base_url: Incomplete | None = None,
-        client_kwargs: Incomplete | None = None,
-        server_metadata_url: Incomplete | None = None,
-        compliance_fix: Incomplete | None = None,
-        client_auth_methods: Incomplete | None = None,
-        user_agent: Incomplete | None = None,
+        name=None,
+        fetch_token=None,
+        update_token=None,
+        client_id=None,
+        client_secret=None,
+        access_token_url=None,
+        access_token_params=None,
+        authorize_url=None,
+        authorize_params=None,
+        api_base_url=None,
+        client_kwargs=None,
+        server_metadata_url=None,
+        compliance_fix=None,
+        client_auth_methods=None,
+        user_agent=None,
         **kwargs,
     ) -> None: ...
 
 class OAuth2Mixin(_RequestMixin, OAuth2Base):
-    def request(self, method, url, token: Incomplete | None = None, **kwargs): ...
+    def request(self, method, url, token=None, **kwargs): ...
     def load_server_metadata(self): ...
-    def create_authorization_url(self, redirect_uri: Incomplete | None = None, **kwargs): ...
-    def fetch_access_token(self, redirect_uri: Incomplete | None = None, **kwargs): ...
+    def create_authorization_url(self, redirect_uri=None, **kwargs): ...
+    def fetch_access_token(self, redirect_uri=None, **kwargs): ...

stubs/Authlib/authlib/integrations/base_client/sync_openid.pyi

@@ -1,7 +1,5 @@
-from _typeshed import Incomplete
-
 class OpenIDMixin:
     def fetch_jwk_set(self, force: bool = False): ...
     def userinfo(self, **kwargs): ...
-    def parse_id_token(self, token, nonce, claims_options: Incomplete | None = None, leeway: int = 120): ...
+    def parse_id_token(self, token, nonce, claims_options=None, leeway: int = 120): ...
     def create_load_key(self): ...

stubs/Authlib/authlib/jose/drafts/_jwe_algorithms.pyi

@@ -9,18 +9,18 @@ class ECDH1PUAlgorithm(JWEAlgorithmWithTagAwareKeyAgreement):
     description: str
     key_size: Incomplete
     aeskw: Incomplete
-    def __init__(self, key_size: Incomplete | None = None) -> None: ...
+    def __init__(self, key_size=None) -> None: ...
     def prepare_key(self, raw_data): ...
     def generate_preset(self, enc_alg, key): ...
     def compute_shared_key(self, shared_key_e, shared_key_s): ...
     def compute_fixed_info(self, headers, bit_size, tag): ...
     def compute_derived_key(self, shared_key, fixed_info, bit_size): ...
     def deliver_at_sender(self, sender_static_key, sender_ephemeral_key, recipient_pubkey, headers, bit_size, tag): ...
     def deliver_at_recipient(self, recipient_key, sender_static_pubkey, sender_ephemeral_pubkey, headers, bit_size, tag): ...
-    def generate_keys_and_prepare_headers(self, enc_alg, key, sender_key, preset: Incomplete | None = None): ...
+    def generate_keys_and_prepare_headers(self, enc_alg, key, sender_key, preset=None): ...
     def agree_upon_key_and_wrap_cek(self, enc_alg, headers, key, sender_key, epk, cek, tag): ...
-    def wrap(self, enc_alg, headers, key, sender_key, preset: Incomplete | None = None): ...
-    def unwrap(self, enc_alg, ek, headers, key, sender_key, tag: Incomplete | None = None): ...
+    def wrap(self, enc_alg, headers, key, sender_key, preset=None): ...
+    def unwrap(self, enc_alg, ek, headers, key, sender_key, tag=None): ...
 
 JWE_DRAFT_ALG_ALGORITHMS: Incomplete
 

stubs/Authlib/authlib/jose/jwk.pyi

@@ -1,4 +1,2 @@
-from _typeshed import Incomplete
-
-def loads(obj, kid: Incomplete | None = None): ...
-def dumps(key, kty: Incomplete | None = None, **params): ...
+def loads(obj, kid=None): ...
+def dumps(key, kty=None, **params): ...

stubs/Authlib/authlib/jose/rfc7515/jws.pyi

@@ -3,12 +3,12 @@ from _typeshed import Incomplete
 class JsonWebSignature:
     REGISTERED_HEADER_PARAMETER_NAMES: Incomplete
     ALGORITHMS_REGISTRY: Incomplete
-    def __init__(self, algorithms: Incomplete | None = None, private_headers: Incomplete | None = None) -> None: ...
+    def __init__(self, algorithms=None, private_headers=None) -> None: ...
     @classmethod
     def register_algorithm(cls, algorithm) -> None: ...
     def serialize_compact(self, protected, payload, key): ...
-    def deserialize_compact(self, s, key, decode: Incomplete | None = None): ...
+    def deserialize_compact(self, s, key, decode=None): ...
     def serialize_json(self, header_obj, payload, key): ...
-    def deserialize_json(self, obj, key, decode: Incomplete | None = None): ...
+    def deserialize_json(self, obj, key, decode=None): ...
     def serialize(self, header, payload, key): ...
-    def deserialize(self, s, key, decode: Incomplete | None = None): ...
+    def deserialize(self, s, key, decode=None): ...