Merge branch 'main' into rm-3.9-workaround

Author: srittau

stdlib/@tests/test_cases/email/check_message.py

@@ -1,5 +1,5 @@
-from email.headerregistry import Address
-from email.message import EmailMessage
+from email.headerregistry import Address, BaseHeader
+from email.message import EmailMessage, MIMEPart
 from typing_extensions import assert_type
 
 msg = EmailMessage()
@@ -8,3 +8,11 @@
 
 for a in msg.iter_attachments():
     assert_type(a, EmailMessage)
+
+generic_msg: EmailMessage[BaseHeader, str] = EmailMessage()
+assert_type(generic_msg.get("To"), BaseHeader | None)
+assert_type(generic_msg.get_body(), MIMEPart[BaseHeader, str] | None)
+for a in generic_msg.iter_attachments():
+    assert_type(a, EmailMessage[BaseHeader, str])
+for p in generic_msg.iter_parts():
+    assert_type(p, MIMEPart[BaseHeader, str])

stdlib/email/message.pyi

@@ -151,13 +151,15 @@ class Message(Generic[_HeaderT_co, _HeaderParamT_contra]):
 
 class MIMEPart(Message[_HeaderRegistryT_co, _HeaderRegistryParamT_contra]):
     def __init__(self, policy: Policy[Any] | None = None) -> None: ...
-    def get_body(self, preferencelist: Sequence[str] = ("related", "html", "plain")) -> MIMEPart[_HeaderRegistryT_co] | None: ...
+    def get_body(
+        self, preferencelist: Sequence[str] = ("related", "html", "plain")
+    ) -> MIMEPart[_HeaderRegistryT_co, _HeaderRegistryParamT_contra] | None: ...
     def attach(self, payload: Self) -> None: ...  # type: ignore[override]
     # The attachments are created via type(self) in the attach method. It's theoretically
     # possible to sneak other attachment types into a MIMEPart instance, but could cause
     # cause unforseen consequences.
     def iter_attachments(self) -> Iterator[Self]: ...
-    def iter_parts(self) -> Iterator[MIMEPart[_HeaderRegistryT_co]]: ...
+    def iter_parts(self) -> Iterator[MIMEPart[_HeaderRegistryT_co, _HeaderRegistryParamT_contra]]: ...
     def get_content(self, *args: Any, content_manager: ContentManager | None = None, **kw: Any) -> Any: ...
     def set_content(self, *args: Any, content_manager: ContentManager | None = None, **kw: Any) -> None: ...
     def make_related(self, boundary: str | None = None) -> None: ...
@@ -171,4 +173,4 @@ class MIMEPart(Message[_HeaderRegistryT_co, _HeaderRegistryParamT_contra]):
     def as_string(self, unixfrom: bool = False, maxheaderlen: int | None = None, policy: Policy[Any] | None = None) -> str: ...
     def is_attachment(self) -> bool: ...
 
-class EmailMessage(MIMEPart): ...
+class EmailMessage(MIMEPart[_HeaderRegistryT_co, _HeaderRegistryParamT_contra]): ...

stubs/Authlib/METADATA.toml

@@ -1,3 +1,3 @@
-version = "1.6.10"
+version = "1.6.11"
 upstream-repository = "https://github.com/authlib/authlib"
 dependencies = ["cryptography"]

stubs/channels/METADATA.toml

@@ -1,6 +1,6 @@
 version = "4.3.*"
 upstream-repository = "https://github.com/django/channels"
-dependencies = ["django-stubs>=4.2", "asgiref"]
+dependencies = ["django-stubs>=6.0.3", "asgiref"]
 
 [tool.stubtest]
 mypy-plugins = ['mypy_django_plugin.main']

stubs/channels/channels/auth.pyi

@@ -1,3 +1,5 @@
+from _typeshed import Incomplete
+
 from asgiref.typing import ASGIReceiveCallable, ASGISendCallable
 from channels.middleware import BaseMiddleware
 from django.contrib.auth.backends import BaseBackend
@@ -14,7 +16,7 @@ async def logout(scope: _ChannelScope) -> None: ...
 
 # Inherits AbstractBaseUser to improve autocomplete and show this is a lazy proxy for a user.
 # At runtime, it's just a LazyObject that wraps the actual user instance.
-class UserLazyObject(AbstractBaseUser, LazyObject): ...
+class UserLazyObject(AbstractBaseUser, LazyObject[Incomplete]): ...
 
 class AuthMiddleware(BaseMiddleware):
     def populate_scope(self, scope: _ChannelScope) -> None: ...

stubs/channels/channels/consumer.pyi

@@ -1,3 +1,4 @@
+from _typeshed import Incomplete
 from collections.abc import Awaitable
 from typing import Any, ClassVar, Protocol, TypedDict, type_check_only
 
@@ -11,7 +12,7 @@ from django.utils.functional import LazyObject
 # We subclass both for type checking purposes to expose SessionBase attributes,
 # and suppress mypy's "misc" error with `# type: ignore[misc]`.
 @type_check_only
-class _LazySession(SessionBase, LazyObject):  # type: ignore[misc]
+class _LazySession(SessionBase, LazyObject[Incomplete]):  # type: ignore[misc]
     _wrapped: SessionBase
 
 @type_check_only