From 6b723a160d8070abda3900b205082a1ded9de4a6 Mon Sep 17 00:00:00 2001 From: Winston Chang Date: Fri, 24 Jun 2022 10:53:09 -0500 Subject: [PATCH 1/2] Fix type hints for log_config --- uvicorn/config.py | 5 +++-- uvicorn/main.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/uvicorn/config.py b/uvicorn/config.py index 5e13fe9fb..f50bc3bc2 100644 --- a/uvicorn/config.py +++ b/uvicorn/config.py @@ -10,6 +10,7 @@ from pathlib import Path from typing import ( TYPE_CHECKING, + Any, Awaitable, Callable, Dict, @@ -91,7 +92,7 @@ SSL_PROTOCOL_VERSION: int = ssl.PROTOCOL_TLS_SERVER -LOGGING_CONFIG: dict = { +LOGGING_CONFIG: Dict[str, Any] = { "version": 1, "disable_existing_loggers": False, "formatters": { @@ -222,7 +223,7 @@ def __init__( ws_per_message_deflate: Optional[bool] = True, lifespan: LifespanType = "auto", env_file: Optional[Union[str, os.PathLike]] = None, - log_config: Optional[Union[dict, str]] = LOGGING_CONFIG, + log_config: Optional[Union[Dict[str, Any], str]] = LOGGING_CONFIG, log_level: Optional[Union[str, int]] = None, access_log: bool = True, use_colors: Optional[bool] = None, diff --git a/uvicorn/main.py b/uvicorn/main.py index 58e01305a..e44c191c2 100644 --- a/uvicorn/main.py +++ b/uvicorn/main.py @@ -478,7 +478,7 @@ def run( reload_delay: float = 0.25, workers: typing.Optional[int] = None, env_file: typing.Optional[str] = None, - log_config: typing.Optional[typing.Union[dict, str]] = None, + log_config: typing.Optional[typing.Union[typing.Dict[str, typing.Any], str]] = None, log_level: typing.Optional[str] = None, access_log: bool = True, proxy_headers: bool = True, From d2828af426250ea76e4841c47d07df8e71985430 Mon Sep 17 00:00:00 2001 From: Marcelo Trylesinski Date: Fri, 24 Jun 2022 20:53:07 +0200 Subject: [PATCH 2/2] Update uvicorn/main.py --- uvicorn/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/uvicorn/main.py b/uvicorn/main.py index 8d6db85f8..37c64b3b1 100644 --- a/uvicorn/main.py +++ b/uvicorn/main.py @@ -478,7 +478,9 @@ def run( reload_delay: float = 0.25, workers: typing.Optional[int] = None, env_file: typing.Optional[str] = None, - log_config: typing.Optional[typing.Union[typing.Dict[str, typing.Any], str]] = LOGGING_CONFIG, + log_config: typing.Optional[ + typing.Union[typing.Dict[str, typing.Any], str] + ] = LOGGING_CONFIG, log_level: typing.Optional[str] = None, access_log: bool = True, proxy_headers: bool = True,