From fe7a3a5e24ec5f97508b16987eec431689b6b184 Mon Sep 17 00:00:00 2001 From: Shamil Date: Mon, 26 Aug 2024 22:23:20 +0300 Subject: [PATCH 1/3] Improve type annotations in Flask-Cors stubs --- stubs/Flask-Cors/flask_cors/core.pyi | 33 +++++++++++++------------ stubs/Flask-Cors/flask_cors/version.pyi | 4 ++- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/stubs/Flask-Cors/flask_cors/core.pyi b/stubs/Flask-Cors/flask_cors/core.pyi index 640072661b51..5506998ab02f 100644 --- a/stubs/Flask-Cors/flask_cors/core.pyi +++ b/stubs/Flask-Cors/flask_cors/core.pyi @@ -2,7 +2,7 @@ from collections.abc import Iterable from datetime import timedelta from logging import Logger from re import Pattern -from typing import Any, Literal, TypedDict, TypeVar, overload +from typing import Any, Final, Literal, TypedDict, TypeVar, overload from typing_extensions import TypeAlias import flask @@ -26,21 +26,22 @@ class _Options(TypedDict, total=False): always_send: bool | None LOG: Logger -ACL_ORIGIN: str -ACL_METHODS: str -ACL_ALLOW_HEADERS: str -ACL_EXPOSE_HEADERS: str -ACL_CREDENTIALS: str -ACL_MAX_AGE: str -ACL_RESPONSE_PRIVATE_NETWORK: str -ACL_REQUEST_HEADER_PRIVATE_NETWORK: str -ACL_REQUEST_METHOD: str -ACL_REQUEST_HEADERS: str -ALL_METHODS: list[str] -CONFIG_OPTIONS: list[str] -FLASK_CORS_EVALUATED: str -RegexObject: type[Pattern[str]] -DEFAULT_OPTIONS: _Options + +ACL_ORIGIN: Final[str] = "Access-Control-Allow-Origin" +ACL_METHODS: Final[str] = "Access-Control-Allow-Methods" +ACL_ALLOW_HEADERS: Final[str] = "Access-Control-Allow-Headers" +ACL_EXPOSE_HEADERS: Final[str] = "Access-Control-Expose-Headers" +ACL_CREDENTIALS: Final[str] = "Access-Control-Allow-Credentials" +ACL_MAX_AGE: Final[str] = "Access-Control-Max-Age" +ACL_RESPONSE_PRIVATE_NETWORK: Final[str] = "Access-Control-Allow-Private-Network" +ACL_REQUEST_METHOD: Final[str] = "Access-Control-Request-Method" +ACL_REQUEST_HEADERS: Final[str] = "Access-Control-Request-Headers" +ACL_REQUEST_HEADER_PRIVATE_NETWORK: Final[str] = "Access-Control-Request-Private-Network" +ALL_METHODS: Final[list[str]] = ["GET", "HEAD", "POST", "OPTIONS", "PUT", "PATCH", "DELETE"] +CONFIG_OPTIONS: Final[list[str]] +FLASK_CORS_EVALUATED: Final[str] = "_FLASK_CORS_EVALUATED" +RegexObject: Final[type[Pattern[str]]] +DEFAULT_OPTIONS: Final[_Options] def parse_resources(resources: dict[str, _Options] | Iterable[str] | str | Pattern[str]) -> list[tuple[str, _Options]]: ... def get_regexp_pattern(regexp: str | Pattern[str]) -> str: ... diff --git a/stubs/Flask-Cors/flask_cors/version.pyi b/stubs/Flask-Cors/flask_cors/version.pyi index bda5b5a7f4cc..73e25557ad32 100644 --- a/stubs/Flask-Cors/flask_cors/version.pyi +++ b/stubs/Flask-Cors/flask_cors/version.pyi @@ -1 +1,3 @@ -__version__: str +from typing import Final + +__version__: Final[str] = "4.0.1" From 0ab362c7ba1f0ac62e4d29939999e03c5cca63cc Mon Sep 17 00:00:00 2001 From: Shamil Date: Mon, 26 Aug 2024 22:29:41 +0300 Subject: [PATCH 2/3] Improve type annotations in Flask-Cors stubs --- stubs/Flask-Cors/flask_cors/core.pyi | 2 +- stubs/Flask-Cors/flask_cors/version.pyi | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/stubs/Flask-Cors/flask_cors/core.pyi b/stubs/Flask-Cors/flask_cors/core.pyi index 5506998ab02f..8cf7f14cc839 100644 --- a/stubs/Flask-Cors/flask_cors/core.pyi +++ b/stubs/Flask-Cors/flask_cors/core.pyi @@ -37,7 +37,7 @@ ACL_RESPONSE_PRIVATE_NETWORK: Final[str] = "Access-Control-Allow-Private-Network ACL_REQUEST_METHOD: Final[str] = "Access-Control-Request-Method" ACL_REQUEST_HEADERS: Final[str] = "Access-Control-Request-Headers" ACL_REQUEST_HEADER_PRIVATE_NETWORK: Final[str] = "Access-Control-Request-Private-Network" -ALL_METHODS: Final[list[str]] = ["GET", "HEAD", "POST", "OPTIONS", "PUT", "PATCH", "DELETE"] +ALL_METHODS: Final[list[str]] CONFIG_OPTIONS: Final[list[str]] FLASK_CORS_EVALUATED: Final[str] = "_FLASK_CORS_EVALUATED" RegexObject: Final[type[Pattern[str]]] diff --git a/stubs/Flask-Cors/flask_cors/version.pyi b/stubs/Flask-Cors/flask_cors/version.pyi index 73e25557ad32..bda5b5a7f4cc 100644 --- a/stubs/Flask-Cors/flask_cors/version.pyi +++ b/stubs/Flask-Cors/flask_cors/version.pyi @@ -1,3 +1 @@ -from typing import Final - -__version__: Final[str] = "4.0.1" +__version__: str From fc1526a04e66dc108c380143a4ac41bd9ca02beb Mon Sep 17 00:00:00 2001 From: Shamil Date: Mon, 26 Aug 2024 22:43:52 +0300 Subject: [PATCH 3/3] Improve type annotations in Flask-Cors stubs --- stubs/Flask-Cors/flask_cors/core.pyi | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/stubs/Flask-Cors/flask_cors/core.pyi b/stubs/Flask-Cors/flask_cors/core.pyi index 8cf7f14cc839..8dbdc6828e7f 100644 --- a/stubs/Flask-Cors/flask_cors/core.pyi +++ b/stubs/Flask-Cors/flask_cors/core.pyi @@ -27,19 +27,19 @@ class _Options(TypedDict, total=False): LOG: Logger -ACL_ORIGIN: Final[str] = "Access-Control-Allow-Origin" -ACL_METHODS: Final[str] = "Access-Control-Allow-Methods" -ACL_ALLOW_HEADERS: Final[str] = "Access-Control-Allow-Headers" -ACL_EXPOSE_HEADERS: Final[str] = "Access-Control-Expose-Headers" -ACL_CREDENTIALS: Final[str] = "Access-Control-Allow-Credentials" -ACL_MAX_AGE: Final[str] = "Access-Control-Max-Age" -ACL_RESPONSE_PRIVATE_NETWORK: Final[str] = "Access-Control-Allow-Private-Network" -ACL_REQUEST_METHOD: Final[str] = "Access-Control-Request-Method" -ACL_REQUEST_HEADERS: Final[str] = "Access-Control-Request-Headers" -ACL_REQUEST_HEADER_PRIVATE_NETWORK: Final[str] = "Access-Control-Request-Private-Network" +ACL_ORIGIN: Final = "Access-Control-Allow-Origin" +ACL_METHODS: Final = "Access-Control-Allow-Methods" +ACL_ALLOW_HEADERS: Final = "Access-Control-Allow-Headers" +ACL_EXPOSE_HEADERS: Final = "Access-Control-Expose-Headers" +ACL_CREDENTIALS: Final = "Access-Control-Allow-Credentials" +ACL_MAX_AGE: Final = "Access-Control-Max-Age" +ACL_RESPONSE_PRIVATE_NETWORK: Final = "Access-Control-Allow-Private-Network" +ACL_REQUEST_METHOD: Final = "Access-Control-Request-Method" +ACL_REQUEST_HEADERS: Final = "Access-Control-Request-Headers" +ACL_REQUEST_HEADER_PRIVATE_NETWORK: Final = "Access-Control-Request-Private-Network" ALL_METHODS: Final[list[str]] CONFIG_OPTIONS: Final[list[str]] -FLASK_CORS_EVALUATED: Final[str] = "_FLASK_CORS_EVALUATED" +FLASK_CORS_EVALUATED: Final = "_FLASK_CORS_EVALUATED" RegexObject: Final[type[Pattern[str]]] DEFAULT_OPTIONS: Final[_Options]