uvicorn 0.32.1__tar.gz → 0.34.0__tar.gz

{uvicorn-0.32.1 → uvicorn-0.34.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: uvicorn
-Version: 0.32.1
+Version: 0.34.0
 Summary: The lightning-fast ASGI server.
 Project-URL: Changelog, https://github.com/encode/uvicorn/blob/master/CHANGELOG.md
 Project-URL: Funding, https://github.com/sponsors/encode
@@ -14,7 +14,6 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -23,7 +22,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Internet :: WWW/HTTP
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Requires-Dist: click>=7.0
 Requires-Dist: h11>=0.8
 Requires-Dist: typing-extensions>=4.0; python_version < '3.11'

{uvicorn-0.32.1 → uvicorn-0.34.0}/pyproject.toml

@@ -8,10 +8,10 @@ dynamic = ["version"]
 description = "The lightning-fast ASGI server."
 readme = "README.md"
 license = "BSD-3-Clause"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 authors = [
     { name = "Tom Christie", email = "tom@tomchristie.com" },
-    { name = "Marcelo Trylesinski", email = "marcelotryle@gmail.com" }
+    { name = "Marcelo Trylesinski", email = "marcelotryle@gmail.com" },
 ]
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -20,7 +20,6 @@ classifiers = [
     "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -38,7 +37,7 @@ dependencies = [
 
 [project.optional-dependencies]
 standard = [
-    "colorama>=0.4;sys_platform == 'win32'",
+    "colorama>=0.4; sys_platform == 'win32'",
     "httptools>=0.6.3",
     "python-dotenv>=0.13",
     "PyYAML>=5.1",
@@ -60,11 +59,7 @@ Source = "https://github.com/encode/uvicorn"
 path = "uvicorn/__init__.py"
 
 [tool.hatch.build.targets.sdist]
-include = [
-    "/uvicorn",
-    "/tests",
-    "/requirements.txt",
-]
+include = ["/uvicorn", "/tests", "/requirements.txt"]
 
 [tool.ruff]
 line-length = 120
@@ -94,10 +89,9 @@ addopts = "-rxXs --strict-config --strict-markers"
 xfail_strict = true
 filterwarnings = [
     "error",
-    'ignore: \"watchgod\" is deprecated\, you should switch to watchfiles \(`pip install watchfiles`\)\.:DeprecationWarning',
     "ignore:Uvicorn's native WSGI implementation is deprecated.*:DeprecationWarning",
     "ignore: 'cgi' is deprecated and slated for removal in Python 3.13:DeprecationWarning",
-    "ignore: remove second argument of ws_handler:DeprecationWarning:websockets"
+    "ignore: remove second argument of ws_handler:DeprecationWarning:websockets",
 ]
 
 [tool.coverage.run]
@@ -132,8 +126,6 @@ py-win32 = "sys_platform == 'win32'"
 py-not-win32 = "sys_platform != 'win32'"
 py-linux = "sys_platform == 'linux'"
 py-darwin = "sys_platform == 'darwin'"
-py-gte-38 = "sys_version_info >= (3, 8)"
-py-lt-38 = "sys_version_info < (3, 8)"
 py-gte-39 = "sys_version_info >= (3, 9)"
 py-lt-39 = "sys_version_info < (3, 9)"
 py-gte-310 = "sys_version_info >= (3, 10)"

{uvicorn-0.32.1 → uvicorn-0.34.0}/requirements.txt

@@ -10,23 +10,22 @@ wsproto==1.2.0
 websockets==13.1
 
 # Packaging
-build==1.2.2
-twine==5.1.1
+build==1.2.2.post1
+twine==6.0.1
 
 # Testing
-ruff==0.6.8
-pytest==8.3.3
+ruff==0.8.3
+pytest==8.3.4
 pytest-mock==3.14.0
-mypy==1.11.2
+mypy==1.13.0
 types-click==7.1.8
 types-pyyaml==6.0.12.20240917
-trustme==1.1.0
-cryptography==43.0.1
-coverage==7.6.1
+trustme==1.2.0
+cryptography==44.0.0
+coverage==7.6.9
 coverage-conditional-plugin==0.9.0
-httpx==0.27.2
-watchgod==0.8.2
+httpx==0.28.1
 
 # Documentation
 mkdocs==1.6.1
-mkdocs-material==9.5.39
+mkdocs-material==9.5.48

{uvicorn-0.32.1 → uvicorn-0.34.0}/tests/conftest.py

@@ -9,8 +9,6 @@ from copy import deepcopy
 from hashlib import md5
 from pathlib import Path
 from tempfile import TemporaryDirectory
-from threading import Thread
-from time import sleep
 from typing import Any
 from uuid import uuid4
 
@@ -214,27 +212,6 @@ def short_socket_name(tmp_path, tmp_path_factory):  # pragma: py-win32
                 return
 
 
-def sleep_touch(*paths: Path):
-    sleep(0.1)
-    for p in paths:
-        p.touch()
-
-
-@pytest.fixture
-def touch_soon():
-    threads = []
-
-    def start(*paths: Path):
-        thread = Thread(target=sleep_touch, args=paths)
-        thread.start()
-        threads.append(thread)
-
-    yield start
-
-    for t in threads:
-        t.join()
-
-
 def _unused_port(socket_type: int) -> int:
     """Find an unused localhost port from 1024-65535 and return it."""
     with contextlib.closing(socket.socket(type=socket_type)) as sock:

{uvicorn-0.32.1 → uvicorn-0.34.0}/tests/middleware/test_wsgi.py

@@ -2,7 +2,8 @@ from __future__ import annotations
 
 import io
 import sys
-from typing import AsyncGenerator, Callable
+from collections.abc import AsyncGenerator
+from typing import Callable
 
 import a2wsgi
 import httpx
@@ -72,7 +73,7 @@ async def test_wsgi_post(wsgi_middleware: Callable) -> None:
     async with httpx.AsyncClient(transport=transport, base_url="http://testserver") as client:
         response = await client.post("/", json={"example": 123})
     assert response.status_code == 200
-    assert response.text == '{"example": 123}'
+    assert response.text == '{"example":123}'
 
 
 @pytest.mark.anyio

{uvicorn-0.32.1 → uvicorn-0.34.0}/tests/supervisors/test_reload.py

@@ -1,14 +1,17 @@
 from __future__ import annotations
 
-import logging
 import platform
 import signal
 import socket
 import sys
+from collections.abc import Generator
 from pathlib import Path
+from threading import Thread
 from time import sleep
+from typing import Callable
 
 import pytest
+from pytest_mock import MockerFixture
 
 from tests.utils import as_cwd
 from uvicorn.config import Config
@@ -20,11 +23,6 @@ try:
 except ImportError:  # pragma: no cover
     WatchFilesReload = None  # type: ignore[misc,assignment]
 
-try:
-    from uvicorn.supervisors.watchgodreload import WatchGodReload
-except ImportError:  # pragma: no cover
-    WatchGodReload = None  # type: ignore[misc,assignment]
-
 
 # TODO: Investigate why this is flaky on MacOS M1.
 skip_if_m1 = pytest.mark.skipif(
@@ -33,17 +31,34 @@ skip_if_m1 = pytest.mark.skipif(
 )
 
 
-def run(sockets):
+def run(sockets: list[socket.socket] | None) -> None:
     pass  # pragma: no cover
 
 
+def sleep_touch(*paths: Path):
+    sleep(0.1)
+    for p in paths:
+        p.touch()
+
+
+@pytest.fixture
+def touch_soon() -> Generator[Callable[[Path], None]]:
+    threads: list[Thread] = []
+
+    def start(*paths: Path) -> None:
+        thread = Thread(target=sleep_touch, args=paths)
+        thread.start()
+        threads.append(thread)
+
+    yield start
+
+    for t in threads:
+        t.join()
+
+
 class TestBaseReload:
     @pytest.fixture(autouse=True)
-    def setup(
-        self,
-        reload_directory_structure: Path,
-        reloader_class: type[BaseReload] | None,
-    ):
+    def setup(self, reload_directory_structure: Path, reloader_class: type[BaseReload] | None):
         if reloader_class is None:  # pragma: no cover
             pytest.skip("Needed dependency not installed")
         self.reload_path = reload_directory_structure
@@ -52,17 +67,15 @@ class TestBaseReload:
     def _setup_reloader(self, config: Config) -> BaseReload:
         config.reload_delay = 0  # save time
 
-        if self.reloader_class is WatchGodReload:
-            with pytest.deprecated_call():
-                reloader = self.reloader_class(config, target=run, sockets=[])
-        else:
-            reloader = self.reloader_class(config, target=run, sockets=[])
+        reloader = self.reloader_class(config, target=run, sockets=[])
 
         assert config.should_reload
         reloader.startup()
         return reloader
 
-    def _reload_tester(self, touch_soon, reloader: BaseReload, *files: Path) -> list[Path] | None:
+    def _reload_tester(
+        self, touch_soon: Callable[[Path], None], reloader: BaseReload, *files: Path
+    ) -> list[Path] | None:
         reloader.restart()
         if WatchFilesReload is not None and isinstance(reloader, WatchFilesReload):
             touch_soon(*files)
@@ -73,7 +86,7 @@ class TestBaseReload:
                 file.touch()
         return next(reloader)
 
-    @pytest.mark.parametrize("reloader_class", [StatReload, WatchGodReload, WatchFilesReload])
+    @pytest.mark.parametrize("reloader_class", [StatReload, WatchFilesReload])
     def test_reloader_should_initialize(self) -> None:
         """
         A basic sanity check.
@@ -86,8 +99,8 @@ class TestBaseReload:
             reloader = self._setup_reloader(config)
             reloader.shutdown()
 
-    @pytest.mark.parametrize("reloader_class", [StatReload, WatchGodReload, WatchFilesReload])
-    def test_reload_when_python_file_is_changed(self, touch_soon) -> None:
+    @pytest.mark.parametrize("reloader_class", [StatReload, WatchFilesReload])
+    def test_reload_when_python_file_is_changed(self, touch_soon: Callable[[Path], None]):
         file = self.reload_path / "main.py"
 
         with as_cwd(self.reload_path):
@@ -99,8 +112,8 @@ class TestBaseReload:
 
             reloader.shutdown()
 
-    @pytest.mark.parametrize("reloader_class", [StatReload, WatchGodReload, WatchFilesReload])
-    def test_should_reload_when_python_file_in_subdir_is_changed(self, touch_soon) -> None:
+    @pytest.mark.parametrize("reloader_class", [StatReload, WatchFilesReload])
+    def test_should_reload_when_python_file_in_subdir_is_changed(self, touch_soon: Callable[[Path], None]):
         file = self.reload_path / "app" / "sub" / "sub.py"
 
         with as_cwd(self.reload_path):
@@ -111,8 +124,8 @@ class TestBaseReload:
 
             reloader.shutdown()
 
-    @pytest.mark.parametrize("reloader_class", [WatchFilesReload, WatchGodReload])
-    def test_should_not_reload_when_python_file_in_excluded_subdir_is_changed(self, touch_soon) -> None:
+    @pytest.mark.parametrize("reloader_class", [WatchFilesReload])
+    def test_should_not_reload_when_python_file_in_excluded_subdir_is_changed(self, touch_soon: Callable[[Path], None]):
         sub_dir = self.reload_path / "app" / "sub"
         sub_file = sub_dir / "sub.py"
 
@@ -129,7 +142,7 @@ class TestBaseReload:
             reloader.shutdown()
 
     @pytest.mark.parametrize("reloader_class, result", [(StatReload, False), (WatchFilesReload, True)])
-    def test_reload_when_pattern_matched_file_is_changed(self, result: bool, touch_soon) -> None:
+    def test_reload_when_pattern_matched_file_is_changed(self, result: bool, touch_soon: Callable[[Path], None]):
         file = self.reload_path / "app" / "js" / "main.js"
 
         with as_cwd(self.reload_path):
@@ -140,14 +153,10 @@ class TestBaseReload:
 
             reloader.shutdown()
 
-    @pytest.mark.parametrize(
-        "reloader_class",
-        [
-            pytest.param(WatchFilesReload, marks=skip_if_m1),
-            WatchGodReload,
-        ],
-    )
-    def test_should_not_reload_when_exclude_pattern_match_file_is_changed(self, touch_soon) -> None:
+    @pytest.mark.parametrize("reloader_class", [pytest.param(WatchFilesReload, marks=skip_if_m1)])
+    def test_should_not_reload_when_exclude_pattern_match_file_is_changed(
+        self, touch_soon: Callable[[Path], None]
+    ):  # pragma: py-darwin
         python_file = self.reload_path / "app" / "src" / "main.py"
         css_file = self.reload_path / "app" / "css" / "main.css"
         js_file = self.reload_path / "app" / "js" / "main.js"
@@ -167,8 +176,8 @@ class TestBaseReload:
 
             reloader.shutdown()
 
-    @pytest.mark.parametrize("reloader_class", [StatReload, WatchGodReload, WatchFilesReload])
-    def test_should_not_reload_when_dot_file_is_changed(self, touch_soon) -> None:
+    @pytest.mark.parametrize("reloader_class", [StatReload, WatchFilesReload])
+    def test_should_not_reload_when_dot_file_is_changed(self, touch_soon: Callable[[Path], None]):
         file = self.reload_path / ".dotted"
 
         with as_cwd(self.reload_path):
@@ -179,8 +188,8 @@ class TestBaseReload:
 
             reloader.shutdown()
 
-    @pytest.mark.parametrize("reloader_class", [StatReload, WatchGodReload, WatchFilesReload])
-    def test_should_reload_when_directories_have_same_prefix(self, touch_soon) -> None:
+    @pytest.mark.parametrize("reloader_class", [StatReload, WatchFilesReload])
+    def test_should_reload_when_directories_have_same_prefix(self, touch_soon: Callable[[Path], None]):
         app_dir = self.reload_path / "app"
         app_file = app_dir / "src" / "main.py"
         app_first_dir = self.reload_path / "app_first"
@@ -201,13 +210,9 @@ class TestBaseReload:
 
     @pytest.mark.parametrize(
         "reloader_class",
-        [
-            StatReload,
-            WatchGodReload,
-            pytest.param(WatchFilesReload, marks=skip_if_m1),
-        ],
+        [StatReload, pytest.param(WatchFilesReload, marks=skip_if_m1)],
     )
-    def test_should_not_reload_when_only_subdirectory_is_watched(self, touch_soon) -> None:
+    def test_should_not_reload_when_only_subdirectory_is_watched(self, touch_soon: Callable[[Path], None]):
         app_dir = self.reload_path / "app"
         app_dir_file = self.reload_path / "app" / "src" / "main.py"
         root_file = self.reload_path / "main.py"
@@ -224,14 +229,8 @@ class TestBaseReload:
 
         reloader.shutdown()
 
-    @pytest.mark.parametrize(
-        "reloader_class",
-        [
-            pytest.param(WatchFilesReload, marks=skip_if_m1),
-            WatchGodReload,
-        ],
-    )
-    def test_override_defaults(self, touch_soon) -> None:
+    @pytest.mark.parametrize("reloader_class", [pytest.param(WatchFilesReload, marks=skip_if_m1)])
+    def test_override_defaults(self, touch_soon: Callable[[Path], None]) -> None:  # pragma: py-darwin
         dotted_file = self.reload_path / ".dotted"
         dotted_dir_file = self.reload_path / ".dotted_dir" / "file.txt"
         python_file = self.reload_path / "main.py"
@@ -252,14 +251,8 @@ class TestBaseReload:
 
             reloader.shutdown()
 
-    @pytest.mark.parametrize(
-        "reloader_class",
-        [
-            pytest.param(WatchFilesReload, marks=skip_if_m1),
-            WatchGodReload,
-        ],
-    )
-    def test_explicit_paths(self, touch_soon) -> None:
+    @pytest.mark.parametrize("reloader_class", [pytest.param(WatchFilesReload, marks=skip_if_m1)])
+    def test_explicit_paths(self, touch_soon: Callable[[Path], None]) -> None:  # pragma: py-darwin
         dotted_file = self.reload_path / ".dotted"
         non_dotted_file = self.reload_path / "ext" / "ext.jpg"
         python_file = self.reload_path / "main.py"
@@ -307,33 +300,9 @@ class TestBaseReload:
 
             reloader.shutdown()
 
-    @pytest.mark.parametrize("reloader_class", [WatchGodReload])
-    def test_should_detect_new_reload_dirs(self, touch_soon, caplog: pytest.LogCaptureFixture, tmp_path: Path) -> None:
-        app_dir = tmp_path / "app"
-        app_file = app_dir / "file.py"
-        app_dir.mkdir()
-        app_file.touch()
-        app_first_dir = tmp_path / "app_first"
-        app_first_file = app_first_dir / "file.py"
-
-        with as_cwd(tmp_path):
-            config = Config(app="tests.test_config:asgi_app", reload=True, reload_includes=["app*"])
-            reloader = self._setup_reloader(config)
-            assert self._reload_tester(touch_soon, reloader, app_file)
-
-            app_first_dir.mkdir()
-            assert self._reload_tester(touch_soon, reloader, app_first_file)
-            assert caplog.records[-2].levelno == logging.INFO
-            assert (
-                caplog.records[-1].message == "WatchGodReload detected a new reload "
-                f"dir '{app_first_dir.name}' in '{tmp_path}'; Adding to watch list."
-            )
-
-            reloader.shutdown()
-
 
 @pytest.mark.skipif(WatchFilesReload is None, reason="watchfiles not available")
-def test_should_watch_one_dir_cwd(mocker, reload_directory_structure):
+def test_should_watch_one_dir_cwd(mocker: MockerFixture, reload_directory_structure: Path):
     mock_watch = mocker.patch("uvicorn.supervisors.watchfilesreload.watch")
     app_dir = reload_directory_structure / "app"
     app_first_dir = reload_directory_structure / "app_first"
@@ -350,7 +319,7 @@ def test_should_watch_one_dir_cwd(mocker, reload_directory_structure):
 
 
 @pytest.mark.skipif(WatchFilesReload is None, reason="watchfiles not available")
-def test_should_watch_separate_dirs_outside_cwd(mocker, reload_directory_structure):
+def test_should_watch_separate_dirs_outside_cwd(mocker: MockerFixture, reload_directory_structure: Path):
     mock_watch = mocker.patch("uvicorn.supervisors.watchfilesreload.watch")
     app_dir = reload_directory_structure / "app"
     app_first_dir = reload_directory_structure / "app_first"
@@ -368,7 +337,7 @@ def test_should_watch_separate_dirs_outside_cwd(mocker, reload_directory_structu
     }
 
 
-def test_display_path_relative(tmp_path):
+def test_display_path_relative(tmp_path: Path):
     with as_cwd(tmp_path):
         p = tmp_path / "app" / "foobar.py"
         # accept windows paths as wells as posix
@@ -380,8 +349,8 @@ def test_display_path_non_relative():
     assert _display_path(p) in ("'/foo/bar.py'", "'\\foo\\bar.py'")
 
 
-def test_base_reloader_run(tmp_path):
-    calls = []
+def test_base_reloader_run(tmp_path: Path):
+    calls: list[str] = []
     step = 0
 
     class CustomReload(BaseReload):
@@ -411,7 +380,7 @@ def test_base_reloader_run(tmp_path):
     assert calls == ["startup", "restart", "shutdown"]
 
 
-def test_base_reloader_should_exit(tmp_path):
+def test_base_reloader_should_exit(tmp_path: Path):
     config = Config(app="tests.test_config:asgi_app", reload=True)
     reloader = BaseReload(config, target=run, sockets=[])
     assert not reloader.should_exit.is_set()

{uvicorn-0.32.1 → uvicorn-0.34.0}/tests/test_cli.py

@@ -3,9 +3,9 @@ import importlib
 import os
 import platform
 import sys
+from collections.abc import Iterator
 from pathlib import Path
 from textwrap import dedent
-from typing import Iterator
 from unittest import mock
 
 import pytest

{uvicorn-0.32.1 → uvicorn-0.34.0}/tests/test_server.py

@@ -5,7 +5,9 @@ import contextlib
 import logging
 import signal
 import sys
-from typing import Callable, ContextManager, Generator
+from collections.abc import Generator
+from contextlib import AbstractContextManager
+from typing import Callable
 
 import httpx
 import pytest
@@ -62,7 +64,7 @@ else:  # pragma: py-win32
 @pytest.mark.parametrize("exception_signal", signals)
 @pytest.mark.parametrize("capture_signal", signal_captures)
 async def test_server_interrupt(
-    exception_signal: signal.Signals, capture_signal: Callable[[signal.Signals], ContextManager[None]]
+    exception_signal: signal.Signals, capture_signal: Callable[[signal.Signals], AbstractContextManager[None]]
 ):  # pragma: py-win32
     """Test interrupting a Server that is run explicitly inside asyncio"""
 

{uvicorn-0.32.1 → uvicorn-0.34.0}/uvicorn/__init__.py

@@ -1,5 +1,5 @@
 from uvicorn.config import Config
 from uvicorn.main import Server, main, run
 
-__version__ = "0.32.1"
+__version__ = "0.34.0"
 __all__ = ["main", "run", "Config", "Server"]

{uvicorn-0.32.1 → uvicorn-0.34.0}/uvicorn/_types.py

@@ -32,20 +32,8 @@ from __future__ import annotations
 
 import sys
 import types
-from typing import (
-    Any,
-    Awaitable,
-    Callable,
-    Iterable,
-    Literal,
-    MutableMapping,
-    Optional,
-    Protocol,
-    Tuple,
-    Type,
-    TypedDict,
-    Union,
-)
+from collections.abc import Awaitable, Iterable, MutableMapping
+from typing import Any, Callable, Literal, Optional, Protocol, TypedDict, Union
 
 if sys.version_info >= (3, 11):  # pragma: py-lt-311
     from typing import NotRequired
@@ -54,8 +42,8 @@ else:  # pragma: py-gte-311
 
 # WSGI
 Environ = MutableMapping[str, Any]
-ExcInfo = Tuple[Type[BaseException], BaseException, Optional[types.TracebackType]]
-StartResponse = Callable[[str, Iterable[Tuple[str, str]], Optional[ExcInfo]], None]
+ExcInfo = tuple[type[BaseException], BaseException, Optional[types.TracebackType]]
+StartResponse = Callable[[str, Iterable[tuple[str, str]], Optional[ExcInfo]], None]
 WSGIApp = Callable[[Environ, StartResponse], Union[Iterable[bytes], BaseException]]
 
 
@@ -281,7 +269,7 @@ class ASGI2Protocol(Protocol):
     async def __call__(self, receive: ASGIReceiveCallable, send: ASGISendCallable) -> None: ...  # pragma: no cover
 
 
-ASGI2Application = Type[ASGI2Protocol]
+ASGI2Application = type[ASGI2Protocol]
 ASGI3Application = Callable[
     [
         Scope,

{uvicorn-0.32.1 → uvicorn-0.34.0}/uvicorn/config.py

@@ -9,9 +9,10 @@ import os
 import socket
 import ssl
 import sys
+from collections.abc import Awaitable
 from configparser import RawConfigParser
 from pathlib import Path
-from typing import IO, Any, Awaitable, Callable, Literal
+from typing import IO, Any, Callable, Literal
 
 import click
 
@@ -137,7 +138,7 @@ def resolve_reload_patterns(patterns_list: list[str], directories_list: list[str
         # Special case for the .* pattern, otherwise this would only match
         # hidden directories which is probably undesired
         if pattern == ".*":
-            continue
+            continue  # pragma: py-darwin
         patterns.append(pattern)
         if is_dir(Path(pattern)):
             directories.append(Path(pattern))

{uvicorn-0.32.1 → uvicorn-0.34.0}/uvicorn/logging.py

@@ -16,7 +16,7 @@ class ColourizedFormatter(logging.Formatter):
     A custom log formatter class that:
 
     * Outputs the LOG_LEVEL with an appropriate color.
-    * If a log call includes an `extras={"color_message": ...}` it will be used
+    * If a log call includes an `extra={"color_message": ...}` it will be used
       for formatting the output, instead of the plain text message.
     """
 

{uvicorn-0.32.1 → uvicorn-0.34.0}/uvicorn/middleware/wsgi.py

@@ -6,7 +6,7 @@ import io
 import sys
 import warnings
 from collections import deque
-from typing import Iterable
+from collections.abc import Iterable
 
 from uvicorn._types import (
     ASGIReceiveCallable,

{uvicorn-0.32.1 → uvicorn-0.34.0}/uvicorn/protocols/websockets/websockets_impl.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 import asyncio
 import http
 import logging
-from typing import Any, Literal, Optional, Sequence, cast
+from collections.abc import Sequence
+from typing import Any, Literal, Optional, cast
 from urllib.parse import unquote
 
 import websockets

{uvicorn-0.32.1 → uvicorn-0.34.0}/uvicorn/protocols/websockets/wsproto_impl.py

@@ -224,6 +224,7 @@ class WSProtocol(asyncio.Protocol):
         headers: list[tuple[bytes, bytes]] = [
             (b"content-type", b"text/plain; charset=utf-8"),
             (b"connection", b"close"),
+            (b"content-length", b"21"),
         ]
         output = self.conn.send(wsproto.events.RejectConnection(status_code=500, headers=headers, has_body=True))
         output += self.conn.send(wsproto.events.RejectData(data=b"Internal Server Error"))

{uvicorn-0.32.1 → uvicorn-0.34.0}/uvicorn/server.py

@@ -10,9 +10,10 @@ import socket
 import sys
 import threading
 import time
+from collections.abc import Generator, Sequence
 from email.utils import formatdate
 from types import FrameType
-from typing import TYPE_CHECKING, Generator, Sequence, Union
+from typing import TYPE_CHECKING, Union
 
 import click
 
@@ -284,10 +285,7 @@ class Server:
                 len(self.server_state.tasks),
             )
             for t in self.server_state.tasks:
-                if sys.version_info < (3, 9):  # pragma: py-gte-39
-                    t.cancel()
-                else:  # pragma: py-lt-39
-                    t.cancel(msg="Task cancelled, timeout graceful shutdown exceeded")
+                t.cancel(msg="Task cancelled, timeout graceful shutdown exceeded")
 
         # Send the lifespan shutdown event, and wait for application shutdown.
         if not self.force_exit:

uvicorn-0.34.0/uvicorn/supervisors/__init__.py

@@ -0,0 +1,16 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from uvicorn.supervisors.basereload import BaseReload
+from uvicorn.supervisors.multiprocess import Multiprocess
+
+if TYPE_CHECKING:
+    ChangeReload: type[BaseReload]
+else:
+    try:
+        from uvicorn.supervisors.watchfilesreload import WatchFilesReload as ChangeReload
+    except ImportError:  # pragma: no cover
+        from uvicorn.supervisors.statreload import StatReload as ChangeReload
+
+__all__ = ["Multiprocess", "ChangeReload"]

{uvicorn-0.32.1 → uvicorn-0.34.0}/uvicorn/supervisors/basereload.py

@@ -5,10 +5,11 @@ import os
 import signal
 import sys
 import threading
+from collections.abc import Iterator
 from pathlib import Path
 from socket import socket
 from types import FrameType
-from typing import Callable, Iterator
+from typing import Callable
 
 import click
 

{uvicorn-0.32.1 → uvicorn-0.34.0}/uvicorn/supervisors/statreload.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
 import logging
+from collections.abc import Iterator
 from pathlib import Path
 from socket import socket
-from typing import Callable, Iterator
+from typing import Callable
 
 from uvicorn.config import Config
 from uvicorn.supervisors.basereload import BaseReload

{uvicorn-0.32.1 → uvicorn-0.34.0}/uvicorn/workers.py

@@ -11,7 +11,7 @@ from gunicorn.arbiter import Arbiter
 from gunicorn.workers.base import Worker
 
 from uvicorn.config import Config
-from uvicorn.main import Server
+from uvicorn.server import Server
 
 warnings.warn(
     "The `uvicorn.workers` module is deprecated. Please use `uvicorn-worker` package instead.\n"

uvicorn-0.32.1/uvicorn/supervisors/__init__.py

@@ -1,23 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from uvicorn.supervisors.basereload import BaseReload
-from uvicorn.supervisors.multiprocess import Multiprocess
-
-if TYPE_CHECKING:
-    ChangeReload: type[BaseReload]
-else:
-    try:
-        from uvicorn.supervisors.watchfilesreload import (
-            WatchFilesReload as ChangeReload,
-        )
-    except ImportError:  # pragma: no cover
-        try:
-            from uvicorn.supervisors.watchgodreload import (
-                WatchGodReload as ChangeReload,
-            )
-        except ImportError:
-            from uvicorn.supervisors.statreload import StatReload as ChangeReload
-
-__all__ = ["Multiprocess", "ChangeReload"]

uvicorn-0.32.1/uvicorn/supervisors/watchgodreload.py

@@ -1,152 +0,0 @@
-from __future__ import annotations
-
-import logging
-import warnings
-from pathlib import Path
-from socket import socket
-from typing import TYPE_CHECKING, Callable
-
-from watchgod import DefaultWatcher
-
-from uvicorn.config import Config
-from uvicorn.supervisors.basereload import BaseReload
-
-if TYPE_CHECKING:
-    import os
-
-    DirEntry = os.DirEntry[str]
-
-logger = logging.getLogger("uvicorn.error")
-
-
-class CustomWatcher(DefaultWatcher):
-    def __init__(self, root_path: Path, config: Config):
-        default_includes = ["*.py"]
-        self.includes = [default for default in default_includes if default not in config.reload_excludes]
-        self.includes.extend(config.reload_includes)
-        self.includes = list(set(self.includes))
-
-        default_excludes = [".*", ".py[cod]", ".sw.*", "~*"]
-        self.excludes = [default for default in default_excludes if default not in config.reload_includes]
-        self.excludes.extend(config.reload_excludes)
-        self.excludes = list(set(self.excludes))
-
-        self.watched_dirs: dict[str, bool] = {}
-        self.watched_files: dict[str, bool] = {}
-        self.dirs_includes = set(config.reload_dirs)
-        self.dirs_excludes = set(config.reload_dirs_excludes)
-        self.resolved_root = root_path
-        super().__init__(str(root_path))
-
-    def should_watch_file(self, entry: DirEntry) -> bool:
-        cached_result = self.watched_files.get(entry.path)
-        if cached_result is not None:
-            return cached_result
-
-        entry_path = Path(entry)
-
-        # cwd is not verified through should_watch_dir, so we need to verify here
-        if entry_path.parent == Path.cwd() and Path.cwd() not in self.dirs_includes:
-            self.watched_files[entry.path] = False
-            return False
-        for include_pattern in self.includes:
-            if str(entry_path).endswith(include_pattern):
-                self.watched_files[entry.path] = True
-                return True
-            if entry_path.match(include_pattern):
-                for exclude_pattern in self.excludes:
-                    if entry_path.match(exclude_pattern):
-                        self.watched_files[entry.path] = False
-                        return False
-                self.watched_files[entry.path] = True
-                return True
-        self.watched_files[entry.path] = False
-        return False
-
-    def should_watch_dir(self, entry: DirEntry) -> bool:
-        cached_result = self.watched_dirs.get(entry.path)
-        if cached_result is not None:
-            return cached_result
-
-        entry_path = Path(entry)
-
-        if entry_path in self.dirs_excludes:
-            self.watched_dirs[entry.path] = False
-            return False
-
-        for exclude_pattern in self.excludes:
-            if entry_path.match(exclude_pattern):
-                is_watched = False
-                if entry_path in self.dirs_includes:
-                    is_watched = True
-
-                for directory in self.dirs_includes:
-                    if directory in entry_path.parents:
-                        is_watched = True
-
-                if is_watched:
-                    logger.debug(
-                        "WatchGodReload detected a new excluded dir '%s' in '%s'; " "Adding to exclude list.",
-                        entry_path.relative_to(self.resolved_root),
-                        str(self.resolved_root),
-                    )
-                self.watched_dirs[entry.path] = False
-                self.dirs_excludes.add(entry_path)
-                return False
-
-        if entry_path in self.dirs_includes:
-            self.watched_dirs[entry.path] = True
-            return True
-
-        for directory in self.dirs_includes:
-            if directory in entry_path.parents:
-                self.watched_dirs[entry.path] = True
-                return True
-
-        for include_pattern in self.includes:
-            if entry_path.match(include_pattern):
-                logger.info(
-                    "WatchGodReload detected a new reload dir '%s' in '%s'; " "Adding to watch list.",
-                    str(entry_path.relative_to(self.resolved_root)),
-                    str(self.resolved_root),
-                )
-                self.dirs_includes.add(entry_path)
-                self.watched_dirs[entry.path] = True
-                return True
-
-        self.watched_dirs[entry.path] = False
-        return False
-
-
-class WatchGodReload(BaseReload):
-    def __init__(
-        self,
-        config: Config,
-        target: Callable[[list[socket] | None], None],
-        sockets: list[socket],
-    ) -> None:
-        warnings.warn(
-            '"watchgod" is deprecated, you should switch ' "to watchfiles (`pip install watchfiles`).",
-            DeprecationWarning,
-        )
-        super().__init__(config, target, sockets)
-        self.reloader_name = "WatchGod"
-        self.watchers = []
-        reload_dirs = []
-        for directory in config.reload_dirs:
-            if Path.cwd() not in directory.parents:
-                reload_dirs.append(directory)
-        if Path.cwd() not in reload_dirs:
-            reload_dirs.append(Path.cwd())
-        for w in reload_dirs:
-            self.watchers.append(CustomWatcher(w.resolve(), self.config))
-
-    def should_restart(self) -> list[Path] | None:
-        self.pause()
-
-        for watcher in self.watchers:
-            change = watcher.check()
-            if change != set():
-                return list({Path(c[1]) for c in change})
-
-        return None