From 4dfc7612d923ce1f288644102a04d5fcbf8101ee Mon Sep 17 00:00:00 2001 From: FirelightFlagboy <30697622+FirelightFlagboy@users.noreply.github.com> Date: Mon, 7 Oct 2024 10:48:21 +0200 Subject: [PATCH 1/2] Fix typing for ssl_keyfile field to allow PathLike types --- uvicorn/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uvicorn/config.py b/uvicorn/config.py index 9aff8c968..65dfe651e 100644 --- a/uvicorn/config.py +++ b/uvicorn/config.py @@ -213,7 +213,7 @@ def __init__( timeout_notify: int = 30, timeout_graceful_shutdown: int | None = None, callback_notify: Callable[..., Awaitable[None]] | None = None, - ssl_keyfile: str | None = None, + ssl_keyfile: str | os.PathLike[str] | None = None, ssl_certfile: str | os.PathLike[str] | None = None, ssl_keyfile_password: str | None = None, ssl_version: int = SSL_PROTOCOL_VERSION, From 9115ffae978875086e9a13fc877b89f2d45f0311 Mon Sep 17 00:00:00 2001 From: Marcelo Trylesinski Date: Wed, 9 Oct 2024 09:47:01 +0200 Subject: [PATCH 2/2] Fix test --- uvicorn/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uvicorn/main.py b/uvicorn/main.py index 43956622d..96a10d538 100644 --- a/uvicorn/main.py +++ b/uvicorn/main.py @@ -497,7 +497,7 @@ def run( limit_max_requests: int | None = None, timeout_keep_alive: int = 5, timeout_graceful_shutdown: int | None = None, - ssl_keyfile: str | None = None, + ssl_keyfile: str | os.PathLike[str] | None = None, ssl_certfile: str | os.PathLike[str] | None = None, ssl_keyfile_password: str | None = None, ssl_version: int = SSL_PROTOCOL_VERSION,