Merge main into fix/issue-15269

Author: nightcityblade

AGENTS.md

@@ -0,0 +1,47 @@
+# typeshed - Python type stub repository
+
+typeshed contains [type stubs](https://typing.python.org/en/latest/spec/distributing.html)
+for Python's standard library as well as for some packages available on
+[PyPI](https://pypi.org/) (usually called "third-party stubs" in typeshed)
+that don't provide their own type annotations.
+
+The standard library stubs get vendored by type checkers. Each third-party
+stub package is distributed as a separate package (usually called
+`types-<name>`) on PyPI.
+
+## Directory Structure
+
+- `stdlib/` - Python standard library stubs
+- `stubs/` - PyPI package stubs, one directory per package
+- `scripts`/ - utility scripts
+- `tests/` - scripts for various tests, see `tests/README.md`
+- `lib/` - utility modules used by multiple scripts
+
+## Running tests
+
+To run all tests:
+
+- Create a new virtual environment (venv), update pip
+- Install the dependencies from `requirements-tests.txt` into it
+- Run `tests/runtests.py <path>` from the activated venv
+
+`<path>` is either:
+
+- `stdlib/<stub>.pyi`
+- `stubs/<package>`
+
+See `tests/README.md` for more information about running tests.
+
+## Pull Requests
+
+When opening pull requests, do the following:
+
+- Follow the guidance from `CONTRIBUTING.md`.
+- Run the tests as described above before submitting.
+- Don't include tests for .pyi files, unless the situation is complex. See
+  `tests/REGRESSION.md`.
+- Use a concise PR description:
+  - Either link to an issue or describe the problem briefly, never both.
+  - Limit the summary of changes to one sentence, unless the PR is complex.
+  - Don't include a testing plan.
+- Add the name of the agent used to the PR description.

MAINTAINERS.md

@@ -97,3 +97,9 @@ requests as "not planned" with an explanation like this:
     We gladly accept type stub contributions for third-party libraries that are published on PyPI in typeshed. To contribute a new library, please follow the steps outlined in [CONTRIBUTING.md](/python/typeshed/blob/main/CONTRIBUTING.md). The `create_baseline_stubs.py` script can be useful to create an initial version, suitable for inclusion in typeshed.
 
     That said, we don't keep requests for third-party library stubs open, unless there are issues that need to be addressed before a PR can be opened. Therefore, I'm closing this issue.
+
+### Asking to remove tests
+
+    Please remove the tests. In typeshed, we only add regression tests for functions and classes which are known to have caused complex problems in the past, or where stubs are difficult to get right. 100% test coverage for typeshed is neither necessary nor desirable, as it would lead to code duplication.
+
+    See [`tests/REGRESSION.md`](https://github.com/python/typeshed/blob/main/tests/REGRESSION.md) for more information.

requirements-tests.txt

@@ -5,7 +5,7 @@ pyright==1.1.411
 ty==0.0.59
 
 # Libraries used by our various scripts.
-aiohttp==3.14.1
+aiohttp==3.14.3
 grpcio-tools>=1.76.0; python_version < "3.15" # For grpc_tools.protoc
 mypy-protobuf==5.1.0; python_version < "3.15"
 packaging==26.2

stdlib/@tests/test_cases/check_tkinter.py

@@ -24,7 +24,6 @@ def foo(x: int, y: str) -> None:
 root.after(1000, foo, 10, "lol")
 root.after(1000, foo, 10, 10)  # type: ignore
 
-
 # Font size must be integer
 label = tkinter.Label()
 label.config(font=("", 12))

stdlib/_ctypes.pyi

@@ -373,3 +373,7 @@ def Py_INCREF(o: _T, /) -> _T: ...
 def buffer_info(o: _CData | _CDataType | type[_CData | _CDataType], /) -> tuple[str, int, tuple[int, ...]]: ...
 def call_cdeclfunction(address: int, arguments: tuple[Any, ...], /) -> Any: ...
 def call_function(address: int, arguments: tuple[Any, ...], /) -> Any: ...
+
+# dllist() is available on Linux and other platforms like NetBSD
+if sys.version_info >= (3, 15) and sys.platform != "win32" and sys.platform != "darwin":
+    def dllist() -> list[str]: ...

stdlib/asyncio/protocols.pyi

@@ -27,11 +27,9 @@ class BufferedProtocol(BaseProtocol):
 class DatagramProtocol(BaseProtocol):
     __slots__ = ()
     def connection_made(self, transport: transports.DatagramTransport) -> None: ...  # type: ignore[override]
-    # addr can be a tuple[int, int] for some unusual protocols like socket.AF_NETLINK.
-    # Use tuple[str | Any, int] to not cause typechecking issues on most usual cases.
-    # This could be improved by using tuple[AnyOf[str, int], int] if the AnyOf feature is accepted.
-    # See https://github.com/python/typing/issues/566
-    def datagram_received(self, data: bytes, addr: tuple[str | Any, int]) -> None: ...
+    # addr is a tuple[str, int] for IPv4 or tuple[str, int, int, int] for IPv6.
+    # It can also be a tuple[int, int] for unusual protocols like socket.AF_NETLINK.
+    def datagram_received(self, data: bytes, addr: tuple[Any, ...]) -> None: ...
     def error_received(self, exc: Exception) -> None: ...
 
 class SubprocessProtocol(BaseProtocol):

stdlib/tkinter/__init__.pyi

@@ -3905,7 +3905,7 @@ class OptionMenu(Menubutton):
             variable: StringVar,
             value: str,
             *values: str,
-            command: Callable[[StringVar], object] | None = ...,
+            command: Callable[[str], object] | None = ...,
             name: str | None = None,
         ) -> None: ...
     else:
@@ -3916,7 +3916,7 @@ class OptionMenu(Menubutton):
             variable: StringVar,
             value: str,
             *values: str,
-            command: Callable[[StringVar], object] | None = ...,
+            command: Callable[[str], object] | None = ...,
         ) -> None: ...
     # configure, config, cget are inherited from Menubutton
     # destroy and __getitem__ are overridden, signature does not change

stubs/Authlib/authlib/oauth2/client.pyi

@@ -62,7 +62,16 @@ class OAuth2Client:
     def refresh_token(self, url=None, refresh_token=None, body: str = "", auth=None, headers=None, **kwargs): ...
     def ensure_active_token(self, token=None): ...
     def revoke_token(self, url, token=None, token_type_hint=None, body=None, auth=None, headers=None, **kwargs): ...
-    def introspect_token(self, url, token=None, token_type_hint=None, body=None, auth=None, headers=None, **kwargs): ...
+    def introspect_token(
+        self,
+        url: str,
+        token: str | None = None,
+        token_type_hint: str | None = None,
+        body: str | None = None,
+        auth=None,
+        headers=None,
+        **kwargs,
+    ): ...
     def register_compliance_hook(self, hook_type, hook) -> None: ...
     def parse_response_token(self, resp): ...
     def __del__(self) -> None: ...

stubs/WebOb/METADATA.toml

@@ -1,2 +1,2 @@
-version = "1.8.*"
+version = "~=1.8.11"
 upstream-repository = "https://github.com/Pylons/webob"

stubs/WebOb/webob/util.pyi

@@ -2,6 +2,7 @@ from collections.abc import Callable
 from typing import AnyStr
 
 def html_escape(s: object) -> str: ...
+def urljoin(base: str, url: str | None) -> str: ...
 def header_docstring(header: str, rfc_section: str) -> str: ...
 def warn_deprecation(text: str, version: str, stacklevel: int) -> None: ...