Merge branch 'main' into structured-obsolete-since

Author: srittau

lib/ts_utils/metadata.py

@@ -238,7 +238,12 @@ def read_metadata(distribution: str) -> StubMetadata:
     """
     try:
         with metadata_path(distribution).open("rb") as f:
-            data: dict[str, object] = tomllib.load(f)
+            # This cast is necessary for pyright to understand that the
+            # variable is a dict with object values. Just using
+            # `data: dict[str, object] = tomlkit.load(f)` doesn't work because
+            # pyright still infers TOMLDocument which derives from
+            # dict[Unknown, Unknown].
+            data = cast(dict[str, object], tomlkit.load(f))
     except FileNotFoundError:
         raise NoSuchStubError(f"Typeshed has no stubs for {distribution!r}!") from None
 

stubs/pika/pika/adapters/blocking_connection.pyi

@@ -71,7 +71,7 @@ class BlockingConnection:
     def remove_timeout(self, timeout_id) -> None: ...
     def update_secret(self, new_secret, reason) -> None: ...
     def close(self, reply_code: int = 200, reply_text: str = "Normal shutdown") -> None: ...
-    def process_data_events(self, time_limit: int = 0): ...
+    def process_data_events(self, time_limit: int | None = 0) -> None: ...
     def sleep(self, duration: float) -> None: ...
     def channel(self, channel_number: int | None = None) -> BlockingChannel: ...
     @property