uvicorn 0.33.0__tar.gz → 0.34.1__tar.gz

{uvicorn-0.33.0 → uvicorn-0.34.1}/.gitignore

@@ -1,5 +1,6 @@
 .cache
 .coverage
+.coverage.*
 .mypy_cache/
 __pycache__/
 uvicorn.egg-info/

{uvicorn-0.33.0 → uvicorn-0.34.1}/PKG-INFO

@@ -1,20 +1,20 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: uvicorn
-Version: 0.33.0
+Version: 0.34.1
 Summary: The lightning-fast ASGI server.
-Project-URL: Changelog, https://github.com/encode/uvicorn/blob/master/CHANGELOG.md
+Project-URL: Changelog, https://www.uvicorn.org/release-notes
 Project-URL: Funding, https://github.com/sponsors/encode
 Project-URL: Homepage, https://www.uvicorn.org/
 Project-URL: Source, https://github.com/encode/uvicorn
 Author-email: Tom Christie <tom@tomchristie.com>, Marcelo Trylesinski <marcelotryle@gmail.com>
-License: BSD-3-Clause
+License-Expression: BSD-3-Clause
+License-File: LICENSE.md
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Web Environment
 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 +23,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.33.0 → uvicorn-0.34.1}/pyproject.toml

@@ -8,7 +8,7 @@ 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" },
@@ -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",
@@ -51,7 +50,7 @@ standard = [
 uvicorn = "uvicorn.main:main"
 
 [project.urls]
-Changelog = "https://github.com/encode/uvicorn/blob/master/CHANGELOG.md"
+Changelog = "https://www.uvicorn.org/release-notes"
 Funding = "https://github.com/sponsors/encode"
 Homepage = "https://www.uvicorn.org/"
 Source = "https://github.com/encode/uvicorn"
@@ -86,7 +85,7 @@ disallow_untyped_defs = false
 check_untyped_defs = true
 
 [tool.pytest.ini_options]
-addopts = "-rxXs --strict-config --strict-markers"
+addopts = "-rxXs --strict-config --strict-markers -n 8"
 xfail_strict = true
 filterwarnings = [
     "error",
@@ -96,6 +95,7 @@ filterwarnings = [
 ]
 
 [tool.coverage.run]
+parallel = true
 source_pkgs = ["uvicorn", "tests"]
 plugins = ["coverage_conditional_plugin"]
 omit = ["uvicorn/workers.py", "uvicorn/__main__.py"]
@@ -126,9 +126,8 @@ exclude_lines = [
 py-win32 = "sys_platform == 'win32'"
 py-not-win32 = "sys_platform != 'win32'"
 py-linux = "sys_platform == 'linux'"
+py-not-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.33.0 → uvicorn-0.34.1}/requirements.txt

@@ -5,29 +5,29 @@
 h11 @ git+https://github.com/python-hyper/h11.git@master
 
 # Explicit optionals
-a2wsgi==1.10.7
+a2wsgi==1.10.8
 wsproto==1.2.0
 websockets==13.1
 
 # Packaging
 build==1.2.2.post1
-twine==6.0.1
+twine==6.1.0
 
 # Testing
-ruff==0.8.3
-pytest==8.3.4
+ruff==0.11.2
+pytest==8.3.5
 pytest-mock==3.14.0
-mypy==1.13.0
+pytest-xdist[psutil]==3.6.1
+mypy==1.15.0
 types-click==7.1.8
-types-pyyaml==6.0.12.20240917
-trustme==1.1.0; python_version < '3.9'
-trustme==1.2.0; python_version >= '3.9'
-cryptography==44.0.0
-coverage==7.6.1; python_version < '3.9'
-coverage==7.6.9; python_version >= '3.9'
+types-pyyaml==6.0.12.20250326
+trustme==1.2.1
+cryptography==44.0.2
+coverage==7.8.0
 coverage-conditional-plugin==0.9.0
+coverage-enable-subprocess==1.0
 httpx==0.28.1
 
 # Documentation
 mkdocs==1.6.1
-mkdocs-material==9.5.48
+mkdocs-material==9.6.10

{uvicorn-0.33.0 → uvicorn-0.34.1}/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

{uvicorn-0.33.0 → uvicorn-0.34.1}/tests/protocols/test_http.py

@@ -14,8 +14,8 @@ from uvicorn._types import ASGIApplication, ASGIReceiveCallable, ASGISendCallabl
 from uvicorn.config import WS_PROTOCOLS, Config
 from uvicorn.lifespan.off import LifespanOff
 from uvicorn.lifespan.on import LifespanOn
-from uvicorn.main import ServerState
 from uvicorn.protocols.http.h11_impl import H11Protocol
+from uvicorn.server import ServerState
 
 try:
     from uvicorn.protocols.http.httptools_impl import HttpToolsProtocol
@@ -914,7 +914,7 @@ def test_fragmentation(unused_tcp_port: int):
     def send_fragmented_req(path: str):
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         sock.connect(("127.0.0.1", unused_tcp_port))
-        d = (f"GET {path} HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: close\r\n\r\n").encode()
+        d = (f"GET {path} HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n").encode()
         split = len(path) // 2
         sock.sendall(d[:split])
         time.sleep(0.01)

{uvicorn-0.33.0 → uvicorn-0.34.1}/tests/protocols/test_websocket.py

@@ -9,7 +9,6 @@ import pytest
 import websockets
 import websockets.client
 import websockets.exceptions
-from typing_extensions import TypedDict
 from websockets.extensions.permessage_deflate import ClientPerMessageDeflateFactory
 from websockets.typing import Subprotocol
 
@@ -109,17 +108,14 @@ async def test_invalid_upgrade(ws_protocol_cls: WSProtocol, http_protocol_cls: H
             pass  # ok, wsproto 0.13
         else:
             assert response.status_code == 400
-            assert (
-                response.text.lower().strip().rstrip(".")
-                in [
-                    "missing sec-websocket-key header",
-                    "missing sec-websocket-version header",  # websockets
-                    "missing or empty sec-websocket-key header",  # wsproto
-                    "failed to open a websocket connection: missing " "sec-websocket-key header",
-                    "failed to open a websocket connection: missing or empty " "sec-websocket-key header",
-                    "failed to open a websocket connection: missing sec-websocket-key header; 'sec-websocket-key'",
-                ]
-            )
+            assert response.text.lower().strip().rstrip(".") in [
+                "missing sec-websocket-key header",
+                "missing sec-websocket-version header",  # websockets
+                "missing or empty sec-websocket-key header",  # wsproto
+                "failed to open a websocket connection: missing sec-websocket-key header",
+                "failed to open a websocket connection: missing or empty sec-websocket-key header",
+                "failed to open a websocket connection: missing sec-websocket-key header; 'sec-websocket-key'",
+            ]
 
 
 async def test_accept_connection(ws_protocol_cls: WSProtocol, http_protocol_cls: HTTPProtocol, unused_tcp_port: int):
@@ -780,7 +776,7 @@ async def test_server_reject_connection(
     assert disconnected_message == {"type": "websocket.disconnect", "code": 1006}
 
 
-class EmptyDict(TypedDict): ...
+class EmptyDict(typing.TypedDict): ...
 
 
 async def test_server_reject_connection_with_response(
@@ -1020,7 +1016,7 @@ async def test_server_multiple_websocket_http_response_start_events(
         await websocket_session(f"ws://127.0.0.1:{unused_tcp_port}")
 
     assert exception_message == (
-        "Expected ASGI message 'websocket.http.response.body' but got " "'websocket.http.response.start'."
+        "Expected ASGI message 'websocket.http.response.body' but got 'websocket.http.response.start'."
     )
 
 

{uvicorn-0.33.0 → uvicorn-0.34.1}/tests/supervisors/test_reload.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
-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, Generator
+from typing import Callable
 
 import pytest
 from pytest_mock import MockerFixture
@@ -23,11 +23,8 @@ except ImportError:  # pragma: no cover
     WatchFilesReload = None  # type: ignore[misc,assignment]
 
 
-# TODO: Investigate why this is flaky on MacOS M1.
-skip_if_m1 = pytest.mark.skipif(
-    sys.platform == "darwin" and platform.processor() == "arm",
-    reason="Flaky on MacOS M1",
-)
+# TODO: Investigate why this is flaky on MacOS, and Windows.
+skip_non_linux = pytest.mark.skipif(sys.platform in ("darwin", "win32"), reason="Flaky on Windows and MacOS")
 
 
 def run(sockets: list[socket.socket] | None) -> None:
@@ -98,7 +95,7 @@ class TestBaseReload:
             reloader = self._setup_reloader(config)
             reloader.shutdown()
 
-    @pytest.mark.parametrize("reloader_class", [StatReload, WatchFilesReload])
+    @pytest.mark.parametrize("reloader_class", [StatReload, pytest.param(WatchFilesReload, marks=skip_non_linux)])
     def test_reload_when_python_file_is_changed(self, touch_soon: Callable[[Path], None]):
         file = self.reload_path / "main.py"
 
@@ -140,8 +137,12 @@ 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: Callable[[Path], None]):
+    @pytest.mark.parametrize(
+        "reloader_class, result", [(StatReload, False), pytest.param(WatchFilesReload, True, marks=skip_non_linux)]
+    )
+    def test_reload_when_pattern_matched_file_is_changed(
+        self, result: bool, touch_soon: Callable[[Path], None]
+    ):  # pragma: py-not-linux
         file = self.reload_path / "app" / "js" / "main.js"
 
         with as_cwd(self.reload_path):
@@ -152,10 +153,10 @@ class TestBaseReload:
 
             reloader.shutdown()
 
-    @pytest.mark.parametrize("reloader_class", [pytest.param(WatchFilesReload, marks=skip_if_m1)])
+    @pytest.mark.parametrize("reloader_class", [pytest.param(WatchFilesReload, marks=skip_non_linux)])
     def test_should_not_reload_when_exclude_pattern_match_file_is_changed(
         self, touch_soon: Callable[[Path], None]
-    ):  # pragma: py-darwin
+    ):  # pragma: py-not-linux
         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"
@@ -187,8 +188,10 @@ class TestBaseReload:
 
             reloader.shutdown()
 
-    @pytest.mark.parametrize("reloader_class", [StatReload, WatchFilesReload])
-    def test_should_reload_when_directories_have_same_prefix(self, touch_soon: Callable[[Path], None]):
+    @pytest.mark.parametrize("reloader_class", [StatReload, pytest.param(WatchFilesReload, marks=skip_non_linux)])
+    def test_should_reload_when_directories_have_same_prefix(
+        self, touch_soon: Callable[[Path], None]
+    ):  # pragma: py-not-linux
         app_dir = self.reload_path / "app"
         app_file = app_dir / "src" / "main.py"
         app_first_dir = self.reload_path / "app_first"
@@ -209,9 +212,11 @@ class TestBaseReload:
 
     @pytest.mark.parametrize(
         "reloader_class",
-        [StatReload, pytest.param(WatchFilesReload, marks=skip_if_m1)],
+        [StatReload, pytest.param(WatchFilesReload, marks=skip_non_linux)],
     )
-    def test_should_not_reload_when_only_subdirectory_is_watched(self, touch_soon: Callable[[Path], None]):
+    def test_should_not_reload_when_only_subdirectory_is_watched(
+        self, touch_soon: Callable[[Path], None]
+    ):  # pragma: py-not-linux
         app_dir = self.reload_path / "app"
         app_dir_file = self.reload_path / "app" / "src" / "main.py"
         root_file = self.reload_path / "main.py"
@@ -228,8 +233,8 @@ class TestBaseReload:
 
         reloader.shutdown()
 
-    @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
+    @pytest.mark.parametrize("reloader_class", [pytest.param(WatchFilesReload, marks=skip_non_linux)])
+    def test_override_defaults(self, touch_soon: Callable[[Path], None]) -> None:  # pragma: py-not-linux
         dotted_file = self.reload_path / ".dotted"
         dotted_dir_file = self.reload_path / ".dotted_dir" / "file.txt"
         python_file = self.reload_path / "main.py"
@@ -250,8 +255,8 @@ class TestBaseReload:
 
             reloader.shutdown()
 
-    @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
+    @pytest.mark.parametrize("reloader_class", [pytest.param(WatchFilesReload, marks=skip_non_linux)])
+    def test_explicit_paths(self, touch_soon: Callable[[Path], None]) -> None:  # pragma: py-not-linux
         dotted_file = self.reload_path / ".dotted"
         non_dotted_file = self.reload_path / "ext" / "ext.jpg"
         python_file = self.reload_path / "main.py"

{uvicorn-0.33.0 → uvicorn-0.34.1}/tests/test_auto_detection.py

@@ -5,9 +5,9 @@ import pytest
 
 from uvicorn.config import Config
 from uvicorn.loops.auto import auto_loop_setup
-from uvicorn.main import ServerState
 from uvicorn.protocols.http.auto import AutoHTTPProtocol
 from uvicorn.protocols.websockets.auto import AutoWebSocketsProtocol
+from uvicorn.server import ServerState
 
 try:
     importlib.import_module("uvloop")

{uvicorn-0.33.0 → uvicorn-0.34.1}/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
@@ -131,7 +131,7 @@ def test_cli_incomplete_app_parameter() -> None:
     result = runner.invoke(cli, ["tests.test_cli"])
 
     assert (
-        'Error loading ASGI app. Import string "tests.test_cli" ' 'must be in format "<module>:<attribute>".'
+        'Error loading ASGI app. Import string "tests.test_cli" must be in format "<module>:<attribute>".'
     ) in result.output
     assert result.exit_code == 1
 

{uvicorn-0.33.0 → uvicorn-0.34.1}/tests/test_config.py

@@ -409,7 +409,7 @@ def test_env_file(
     Test that one can load environment variables using an env file.
     """
     fp = tmp_path / ".env"
-    content = f"WEB_CONCURRENCY={web_concurrency}\n" f"FORWARDED_ALLOW_IPS={forwarded_allow_ips}\n"
+    content = f"WEB_CONCURRENCY={web_concurrency}\nFORWARDED_ALLOW_IPS={forwarded_allow_ips}\n"
     fp.write_text(content)
     with caplog.at_level(logging.INFO):
         config = Config(app=asgi_app, env_file=fp)

{uvicorn-0.33.0 → uvicorn-0.34.1}/tests/test_main.py

@@ -1,3 +1,4 @@
+import importlib
 import inspect
 import socket
 from logging import WARNING
@@ -5,6 +6,7 @@ from logging import WARNING
 import httpx
 import pytest
 
+import uvicorn.server
 from tests.utils import run_server
 from uvicorn import Server
 from uvicorn._types import ASGIReceiveCallable, ASGISendCallable, Scope
@@ -79,7 +81,7 @@ def test_run_invalid_app_config_combination(caplog: pytest.LogCaptureFixture) ->
     assert caplog.records[-1].name == "uvicorn.error"
     assert caplog.records[-1].levelno == WARNING
     assert caplog.records[-1].message == (
-        "You must pass the application as an import string to enable " "'reload' or 'workers'."
+        "You must pass the application as an import string to enable 'reload' or 'workers'."
     )
 
 
@@ -113,3 +115,12 @@ async def test_exit_on_create_server_with_invalid_host() -> None:
         server = Server(config=config)
         await server.serve()
     assert exc_info.value.code == 1
+
+
+def test_deprecated_server_state_from_main() -> None:
+    with pytest.deprecated_call(
+        match="uvicorn.main.ServerState is deprecated, use uvicorn.server.ServerState instead."
+    ):
+        main = importlib.import_module("uvicorn.main")
+        server_state_cls = getattr(main, "ServerState")
+    assert server_state_cls is uvicorn.server.ServerState

{uvicorn-0.33.0 → uvicorn-0.34.1}/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,9 @@ 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]],
+    unused_tcp_port: int,
 ):  # pragma: py-win32
     """Test interrupting a Server that is run explicitly inside asyncio"""
 
@@ -71,7 +75,7 @@ async def test_server_interrupt(
             await asyncio.sleep(0.01)
         signal.raise_signal(exception_signal)
 
-    server = Server(Config(app=dummy_app, loop="asyncio"))
+    server = Server(Config(app=dummy_app, loop="asyncio", port=unused_tcp_port))
     asyncio.create_task(interrupt_running(server))
     with capture_signal(exception_signal) as witness:
         await server.serve()

{uvicorn-0.33.0 → uvicorn-0.34.1}/uvicorn/__init__.py

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

{uvicorn-0.33.0 → uvicorn-0.34.1}/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.33.0 → uvicorn-0.34.1}/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  # pragma: py-darwin
+            continue  # pragma: py-not-linux
         patterns.append(pattern)
         if is_dir(Path(pattern)):
             directories.append(Path(pattern))
@@ -279,7 +280,7 @@ class Config:
 
         if (reload_dirs or reload_includes or reload_excludes) and not self.should_reload:
             logger.warning(
-                "Current configuration will not reload as not all conditions are met, " "please refer to documentation."
+                "Current configuration will not reload as not all conditions are met, please refer to documentation."
             )
 
         if self.should_reload:
@@ -445,7 +446,7 @@ class Config:
         else:
             if not self.factory:
                 logger.warning(
-                    "ASGI app factory detected. Using it, " "but please consider setting the --factory flag explicitly."
+                    "ASGI app factory detected. Using it, but please consider setting the --factory flag explicitly."
                 )
 
         if self.interface == "auto":

{uvicorn-0.33.0 → uvicorn-0.34.1}/uvicorn/main.py

@@ -6,6 +6,7 @@ import os
 import platform
 import ssl
 import sys
+import warnings
 from configparser import RawConfigParser
 from typing import IO, Any, Callable
 
@@ -29,7 +30,7 @@ from uvicorn.config import (
     LoopSetupType,
     WSProtocolType,
 )
-from uvicorn.server import Server, ServerState  # noqa: F401  # Used to be defined here.
+from uvicorn.server import Server
 from uvicorn.supervisors import ChangeReload, Multiprocess
 
 LEVEL_CHOICES = click.Choice(list(LOG_LEVELS.keys()))
@@ -81,7 +82,7 @@ def print_version(ctx: click.Context, param: click.Parameter, value: bool) -> No
     "--reload-dir",
     "reload_dirs",
     multiple=True,
-    help="Set reload directories explicitly, instead of using the current working" " directory.",
+    help="Set reload directories explicitly, instead of using the current working directory.",
     type=click.Path(exists=True),
 )
 @click.option(
@@ -106,7 +107,7 @@ def print_version(ctx: click.Context, param: click.Parameter, value: bool) -> No
     type=float,
     default=0.25,
     show_default=True,
-    help="Delay between previous and next check if application needs to be." " Defaults to 0.25s.",
+    help="Delay between previous and next check if application needs to be. Defaults to 0.25s.",
 )
 @click.option(
     "--workers",
@@ -222,7 +223,7 @@ def print_version(ctx: click.Context, param: click.Parameter, value: bool) -> No
     "--proxy-headers/--no-proxy-headers",
     is_flag=True,
     default=True,
-    help="Enable/Disable X-Forwarded-Proto, X-Forwarded-For, X-Forwarded-Port to " "populate remote address info.",
+    help="Enable/Disable X-Forwarded-Proto, X-Forwarded-For, X-Forwarded-Port to populate remote address info.",
 )
 @click.option(
     "--server-header/--no-server-header",
@@ -255,7 +256,7 @@ def print_version(ctx: click.Context, param: click.Parameter, value: bool) -> No
     "--limit-concurrency",
     type=int,
     default=None,
-    help="Maximum number of concurrent connections or tasks to allow, before issuing" " HTTP 503 responses.",
+    help="Maximum number of concurrent connections or tasks to allow, before issuing HTTP 503 responses.",
 )
 @click.option(
     "--backlog",
@@ -565,7 +566,7 @@ def run(
 
     if (config.reload or config.workers > 1) and not isinstance(app, str):
         logger = logging.getLogger("uvicorn.error")
-        logger.warning("You must pass the application as an import string to enable 'reload' or " "'workers'.")
+        logger.warning("You must pass the application as an import string to enable 'reload' or 'workers'.")
         sys.exit(1)
 
     try:
@@ -587,5 +588,17 @@ def run(
         sys.exit(STARTUP_FAILURE)
 
 
+def __getattr__(name: str) -> Any:
+    if name == "ServerState":
+        warnings.warn(
+            "uvicorn.main.ServerState is deprecated, use uvicorn.server.ServerState instead.",
+            DeprecationWarning,
+        )
+        from uvicorn.server import ServerState
+
+        return ServerState
+    raise AttributeError(f"module {__name__} has no attribute {name}")
+
+
 if __name__ == "__main__":
     main()  # pragma: no cover

{uvicorn-0.33.0 → uvicorn-0.34.1}/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,
@@ -82,8 +82,7 @@ def build_environ(scope: HTTPScope, message: ASGIReceiveEvent, body: io.BytesIO)
 class _WSGIMiddleware:
     def __init__(self, app: WSGIApp, workers: int = 10):
         warnings.warn(
-            "Uvicorn's native WSGI implementation is deprecated, you "
-            "should switch to a2wsgi (`pip install a2wsgi`).",
+            "Uvicorn's native WSGI implementation is deprecated, you should switch to a2wsgi (`pip install a2wsgi`).",
             DeprecationWarning,
         )
         self.app = app

{uvicorn-0.33.0 → uvicorn-0.34.1}/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
@@ -213,7 +214,7 @@ class WebSocketProtocol(WebSocketServerProtocol):
     def send_500_response(self) -> None:
         msg = b"Internal Server Error"
         content = [
-            b"HTTP/1.1 500 Internal Server Error\r\n" b"content-type: text/plain; charset=utf-8\r\n",
+            b"HTTP/1.1 500 Internal Server Error\r\ncontent-type: text/plain; charset=utf-8\r\n",
             b"content-length: " + str(len(msg)).encode("ascii") + b"\r\n",
             b"connection: close\r\n",
             b"\r\n",
@@ -337,7 +338,7 @@ class WebSocketProtocol(WebSocketServerProtocol):
                     self.closed_event.set()
 
                 else:
-                    msg = "Expected ASGI message 'websocket.send' or 'websocket.close'," " but got '%s'."
+                    msg = "Expected ASGI message 'websocket.send' or 'websocket.close', but got '%s'."
                     raise RuntimeError(msg % message_type)
             except ConnectionClosed as exc:
                 raise ClientDisconnected from exc
@@ -350,11 +351,11 @@ class WebSocketProtocol(WebSocketServerProtocol):
                 if not message.get("more_body", False):
                     self.closed_event.set()
             else:
-                msg = "Expected ASGI message 'websocket.http.response.body' " "but got '%s'."
+                msg = "Expected ASGI message 'websocket.http.response.body' but got '%s'."
                 raise RuntimeError(msg % message_type)
 
         else:
-            msg = "Unexpected ASGI message '%s', after sending 'websocket.close' " "or response already completed."
+            msg = "Unexpected ASGI message '%s', after sending 'websocket.close' or response already completed."
             raise RuntimeError(msg % message_type)
 
     async def asgi_receive(self) -> WebSocketDisconnectEvent | WebSocketConnectEvent | WebSocketReceiveEvent:

{uvicorn-0.33.0 → uvicorn-0.34.1}/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"))
@@ -343,7 +344,7 @@ class WSProtocol(asyncio.Protocol):
                         self.transport.close()
 
                 else:
-                    msg = "Expected ASGI message 'websocket.send' or 'websocket.close'," " but got '%s'."
+                    msg = "Expected ASGI message 'websocket.send' or 'websocket.close', but got '%s'."
                     raise RuntimeError(msg % message_type)
             except LocalProtocolError as exc:
                 raise ClientDisconnected from exc
@@ -361,7 +362,7 @@ class WSProtocol(asyncio.Protocol):
                     self.transport.close()
 
             else:
-                msg = "Expected ASGI message 'websocket.http.response.body' " "but got '%s'."
+                msg = "Expected ASGI message 'websocket.http.response.body' but got '%s'."
                 raise RuntimeError(msg % message_type)
 
         else:

{uvicorn-0.33.0 → uvicorn-0.34.1}/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
 
@@ -118,7 +119,7 @@ class Server:
 
             def _share_socket(
                 sock: socket.SocketType,
-            ) -> socket.SocketType:  # pragma py-linux pragma: py-darwin
+            ) -> socket.SocketType:  # pragma py-not-win32
                 # Windows requires the socket be explicitly shared across
                 # multiple workers (processes).
                 from socket import fromshare  # type: ignore[attr-defined]
@@ -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.33.0 → uvicorn-0.34.1}/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.33.0 → uvicorn-0.34.1}/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
@@ -23,7 +24,7 @@ class StatReload(BaseReload):
         self.mtimes: dict[Path, float] = {}
 
         if config.reload_excludes or config.reload_includes:
-            logger.warning("--reload-include and --reload-exclude have no effect unless " "watchfiles is installed.")
+            logger.warning("--reload-include and --reload-exclude have no effect unless watchfiles is installed.")
 
     def should_restart(self) -> list[Path] | None:
         self.pause()