Merge branch 'main' into pytype-on-windows-and-Python-3.12

pyrightconfig.stricter.json

@@ -82,6 +82,7 @@
  "stubs/PyMySQL",
  "stubs/python-crontab",
  "stubs/python-dateutil",
+ "stubs/python-http-client",
  "stubs/python-jose",
  "stubs/pywin32",
  "stubs/pyxdg",

stdlib/@tests/stubtest_allowlists/darwin-py311.txt

@@ -18,3 +18,11 @@ ossaudiodev
 fcntl.F_OFD_GETLK
 fcntl.F_OFD_SETLK
 fcntl.F_OFD_SETLKW
+
+# Incompatible changes introduced in Python 3.11.10
+# (Remove once 3.11.10 becomes available for MacOS)
+email._header_value_parser.NLSET
+email._header_value_parser.SPECIALSNL
+email.errors.HeaderWriteError
+email.utils.getaddresses
+email.utils.parseaddr

stdlib/@tests/stubtest_allowlists/py312.txt

@@ -202,8 +202,3 @@ ctypes._endian.SIZEOF_TIME_T
 
 # Incompatible changes introduced in Python 3.12.5
 concurrent.futures.__all__
-email._header_value_parser.NLSET
-email._header_value_parser.SPECIALSNL
-email._policybase.Policy.verify_generated_headers
-email.errors.HeaderWriteError
-email.policy.Policy.verify_generated_headers

stdlib/@tests/stubtest_allowlists/py313.txt

@@ -4,8 +4,6 @@
 
 # TODO: triage these new errors
 _tkinter.create
-doctest.TestResults.__doc__
-doctest.TestResults.__new__
 importlib.resources.Anchor
 importlib.resources.Resource
 importlib.resources.__all__
@@ -119,6 +117,8 @@ ast.ImportFrom.level # None on the class, but never None on instances
 builtins.property.__set_name__ # Doesn't actually exist
 collections\.UserList\.index # ignoring pos-or-keyword parameter
 dataclasses.KW_ONLY # white lies around defaults
+doctest.TestResults.__match_args__ # Stubtest doesn't pick up override
+doctest.TestResults._fields # Stubtest doesn't pick up override
 enum.auto.__init__ # The stub for enum.auto is nothing like the implementation
 enum.auto.value # The stub for enum.auto is nothing like the implementation
 functools._lru_cache_wrapper.cache_parameters # Cannot be detected statically
@@ -191,9 +191,3 @@ codecs.xmlcharrefreplace_errors
 
 # To match `dict`, we lie about the runtime, but use overloads to match the correct behavior
 types.MappingProxyType.get
-
-# logging.warn() was restored after the 3.13 release candidate, which is what CI is using
-logging.__all__
-logging.Logger.warn
-logging.LoggerAdapter.warn
-logging.warn

stdlib/@tests/stubtest_allowlists/py38.txt

@@ -250,3 +250,11 @@ tkinter.EventType.__new__
 ctypes._endian.DEFAULT_MODE
 ctypes._endian.RTLD_GLOBAL
 ctypes._endian.RTLD_LOCAL
+
+# Incompatible changes introduced in Python 3.8.20
+# (Remove once 3.8.20 becomes available for GitHub Actions)
+email._header_value_parser.NLSET
+email._header_value_parser.SPECIALSNL
+email.errors.HeaderWriteError
+email.utils.getaddresses
+email.utils.parseaddr

stdlib/@tests/stubtest_allowlists/win32-py310.txt

@@ -14,3 +14,11 @@ crypt
 nis
 ossaudiodev
 spwd
+
+# Incompatible changes introduced in Python 3.10.15
+# (Remove once 3.10.15 becomes available for Windows)
+email._header_value_parser.NLSET
+email._header_value_parser.SPECIALSNL
+email.errors.HeaderWriteError
+email.utils.getaddresses
+email.utils.parseaddr

stdlib/@tests/stubtest_allowlists/win32-py311.txt

@@ -12,3 +12,11 @@ crypt
 nis
 ossaudiodev
 spwd
+
+# Incompatible changes introduced in Python 3.11.10
+# (Remove once 3.11.10 becomes available for Windows)
+email._header_value_parser.NLSET
+email._header_value_parser.SPECIALSNL
+email.errors.HeaderWriteError
+email.utils.getaddresses
+email.utils.parseaddr

stdlib/@tests/stubtest_allowlists/win32-py39.txt

@@ -14,3 +14,11 @@ crypt
 nis
 ossaudiodev
 spwd
+
+# Incompatible changes introduced in Python 3.9.20
+# (Remove once 3.9.20 becomes available for Windows)
+email._header_value_parser.NLSET
+email._header_value_parser.SPECIALSNL
+email.errors.HeaderWriteError
+email.utils.getaddresses
+email.utils.parseaddr

stdlib/distutils/dist.pyi

@@ -270,7 +270,7 @@ class Distribution:
  def has_data_files(self) -> bool: ...
  def is_pure(self) -> bool: ...
 
- # Getter methods generated in __init__
+ # Default getter methods generated in __init__ from self.metadata._METHOD_BASENAMES
  def get_name(self) -> str: ...
  def get_version(self) -> str: ...
  def get_fullname(self) -> str: ...
@@ -292,3 +292,26 @@ class Distribution:
  def get_requires(self) -> list[str]: ...
  def get_provides(self) -> list[str]: ...
  def get_obsoletes(self) -> list[str]: ...
+
+ # Default attributes generated in __init__ from self.display_option_names
+ help_commands: bool | Literal[0]
+ name: str | Literal[0]
+ version: str | Literal[0]
+ fullname: str | Literal[0]
+ author: str | Literal[0]
+ author_email: str | Literal[0]
+ maintainer: str | Literal[0]
+ maintainer_email: str | Literal[0]
+ contact: str | Literal[0]
+ contact_email: str | Literal[0]
+ url: str | Literal[0]
+ license: str | Literal[0]
+ licence: str | Literal[0]
+ description: str | Literal[0]
+ long_description: str | Literal[0]
+ platforms: str | list[str] | Literal[0]
+ classifiers: str | list[str] | Literal[0]
+ keywords: str | list[str] | Literal[0]
+ provides: list[str] | Literal[0]
+ requires: list[str] | Literal[0]
+ obsoletes: list[str] | Literal[0]

stdlib/doctest.pyi

@@ -1,9 +1,10 @@
+import sys
 import types
 import unittest
 from _typeshed import ExcInfo
 from collections.abc import Callable
-from typing import Any, NamedTuple
-from typing_extensions import TypeAlias
+from typing import Any, ClassVar, NamedTuple
+from typing_extensions import Self, TypeAlias
 
 __all__ = [
  "register_optionflag",
@@ -41,9 +42,22 @@ __all__ = [
  "debug",
 ]
 
-class TestResults(NamedTuple):
- failed: int
- attempted: int
+# MyPy errors on conditionals within named tuples.
+
+if sys.version_info >= (3, 13):
+ class TestResults(NamedTuple):
+ def __new__(cls, failed: int, attempted: int, *, skipped: int = 0) -> Self: ... # type: ignore[misc]
+ skipped: int
+ failed: int
+ attempted: int
+ _fields: ClassVar = ("failed", "attempted") # type: ignore[misc]
+ __match_args__ = ("failed", "attempted") # type: ignore[misc]
+ __doc__: None # type: ignore[misc]
+
+else:
+ class TestResults(NamedTuple):
+ failed: int
+ attempted: int
 
 OPTIONFLAGS_BY_NAME: dict[str, int]
 
@@ -134,6 +148,8 @@ class DocTestRunner:
  original_optionflags: int
  tries: int
  failures: int
+ if sys.version_info >= (3, 13):
+ skips: int
  test: DocTest
  def __init__(self, checker: OutputChecker | None = None, verbose: bool | None = None, optionflags: int = 0) -> None: ...
  def report_start(self, out: _Out, test: DocTest, example: Example) -> None: ...

stdlib/email/_header_value_parser.pyi

@@ -16,6 +16,10 @@ TOKEN_ENDS: Final[set[str]]
 ASPECIALS: Final[set[str]]
 ATTRIBUTE_ENDS: Final[set[str]]
 EXTENDED_ATTRIBUTE_ENDS: Final[set[str]]
+# Added in Python 3.8.20, 3.9.20, 3.10.15, 3.11.10, 3.12.5
+NLSET: Final[set[str]]
+# Added in Python 3.8.20, 3.9.20, 3.10.15, 3.11.10, 3.12.5
+SPECIALSNL: Final[set[str]]
 
 def quote_string(value: Any) -> str: ...
 

stdlib/email/_policybase.pyi

@@ -3,30 +3,45 @@ from collections.abc import Callable
 from email.errors import MessageDefect
 from email.header import Header
 from email.message import Message
-from typing import Any
 from typing_extensions import Self
 
 class _PolicyBase:
- def __add__(self, other: Any) -> Self: ...
- def clone(self, **kw: Any) -> Self: ...
-
-class Policy(_PolicyBase, metaclass=ABCMeta):
- max_line_length: int | None
- linesep: str
- cte_type: str
- raise_on_defect: bool
- mangle_from_: bool
- message_factory: Callable[[Policy], Message] | None
  def __init__(
  self,
  *,
  max_line_length: int | None = 78,
  linesep: str = "\n",
  cte_type: str = "8bit",
  raise_on_defect: bool = False,
- mangle_from_: bool = False,
+ mangle_from_: bool = ..., # default depends on sub-class
  message_factory: Callable[[Policy], Message] | None = None,
+ # Added in Python 3.8.20, 3.9.20, 3.10.15, 3.11.10, 3.12.5
+ verify_generated_headers: bool = True,
  ) -> None: ...
+ def clone(
+ self,
+ *,
+ max_line_length: int | None = ...,
+ linesep: str = ...,
+ cte_type: str = ...,
+ raise_on_defect: bool = ...,
+ mangle_from_: bool = ...,
+ message_factory: Callable[[Policy], Message] | None = ...,
+ # Added in Python 3.8.20, 3.9.20, 3.10.15, 3.11.10, 3.12.5
+ verify_generated_headers: bool = ...,
+ ) -> Self: ...
+ def __add__(self, other: Policy) -> Self: ...
+
+class Policy(_PolicyBase, metaclass=ABCMeta):
+ max_line_length: int | None
+ linesep: str
+ cte_type: str
+ raise_on_defect: bool
+ mangle_from_: bool
+ message_factory: Callable[[Policy], Message] | None
+ # Added in Python 3.8.20, 3.9.20, 3.10.15, 3.11.10, 3.12.5
+ verify_generated_headers: bool
+
  def handle_defect(self, obj: Message, defect: MessageDefect) -> None: ...
  def register_defect(self, obj: Message, defect: MessageDefect) -> None: ...
  def header_max_count(self, name: str) -> int | None: ...

stdlib/email/errors.pyi

@@ -7,6 +7,9 @@ class BoundaryError(MessageParseError): ...
 class MultipartConversionError(MessageError, TypeError): ...
 class CharsetError(MessageError): ...
 
+# Added in Python 3.8.20, 3.9.20, 3.10.15, 3.11.10, 3.12.5
+class HeaderWriteError(MessageError): ...
+
 class MessageDefect(ValueError):
  def __init__(self, line: str | None = None) -> None: ...
 

stdlib/email/utils.pyi

@@ -30,20 +30,12 @@ _PDTZ: TypeAlias = tuple[int, int, int, int, int, int, int, int, int, int | None
 def quote(str: str) -> str: ...
 def unquote(str: str) -> str: ...
 
-if sys.version_info >= (3, 13):
- def parseaddr(addr: str | list[str], *, strict: bool = True) -> tuple[str, str]: ...
-
-else:
- def parseaddr(addr: str) -> tuple[str, str]: ...
-
+# `strict` parameter added in Python 3.8.20, 3.9.20, 3.10.15, 3.11.10, 3.12.5
+def parseaddr(addr: str | list[str], *, strict: bool = True) -> tuple[str, str]: ...
 def formataddr(pair: tuple[str | None, str], charset: str | Charset = "utf-8") -> str: ...
 
-if sys.version_info >= (3, 13):
- def getaddresses(fieldvalues: Iterable[str], *, strict: bool = True) -> list[tuple[str, str]]: ...
-
-else:
- def getaddresses(fieldvalues: Iterable[str]) -> list[tuple[str, str]]: ...
-
+# `strict` parameter added in Python 3.8.20, 3.9.20, 3.10.15, 3.11.10, 3.12.5
+def getaddresses(fieldvalues: Iterable[str], *, strict: bool = True) -> list[tuple[str, str]]: ...
 @overload
 def parsedate(data: None) -> None: ...
 @overload

stdlib/tempfile.pyi

@@ -253,11 +253,11 @@ class _TemporaryFileWrapper(IO[AnyStr]):
  def truncate(self, size: int | None = ...) -> int: ...
  def writable(self) -> bool: ...
  @overload
- def write(self: _TemporaryFileWrapper[str], s: str) -> int: ...
+ def write(self: _TemporaryFileWrapper[str], s: str, /) -> int: ...
  @overload
- def write(self: _TemporaryFileWrapper[bytes], s: ReadableBuffer) -> int: ...
+ def write(self: _TemporaryFileWrapper[bytes], s: ReadableBuffer, /) -> int: ...
  @overload
- def write(self, s: AnyStr) -> int: ...
+ def write(self, s: AnyStr, /) -> int: ...
  @overload
  def writelines(self: _TemporaryFileWrapper[str], lines: Iterable[str]) -> None: ...
  @overload

stubs/docutils/docutils/nodes.pyi

@@ -416,10 +416,15 @@ class system_message(Special, BackLinkable, PreBibliographic, Element):
  def __init__(self, message: str | None = None, *children: Node, **attributes) -> None: ...
 
 class pending(Special, Invisible, Element):
- transform: Transform
+ transform: type[Transform]
  details: Mapping[str, Any]
  def __init__(
- self, transform: Transform, details: Mapping[str, Any] | None = None, rawsource: str = "", *children: Node, **attributes
+ self,
+ transform: type[Transform],
+ details: Mapping[str, Any] | None = None,
+ rawsource: str = "",
+ *children: Node,
+ **attributes,
  ) -> None: ...
 
 class raw(Special, Inline, PreBibliographic, FixedTextElement): ...

stubs/docutils/docutils/parsers/rst/directives/references.pyi

@@ -1,3 +1,3 @@
-from _typeshed import Incomplete
+from docutils.parsers.rst import Directive
 
-def __getattr__(name: str) -> Incomplete: ...
+class TargetNotes(Directive): ...

stubs/mysqlclient/MySQLdb/__init__.pyi

@@ -46,6 +46,6 @@ DATETIME: Incomplete
 ROWID: Incomplete
 
 def Binary(x): ...
-def Connect(*args, **kwargs): ...
+def Connect(*args, **kwargs) -> Connection: ...
 
 connect = Connect

stubs/networkx/networkx/classes/reportviews.pyi

@@ -33,7 +33,7 @@ class NodeDataView(AbstractSet[_Node]):
 
 class DiDegreeView(Generic[_Node]):
  def __init__(self, G: Graph[_Node], nbunch: _NBunch[_Node] = None, weight: None | bool | str = None) -> None: ...
- def __call__(self, nbunch: _NBunch[_Node] = None, weight: None | bool | str = None) -> DiDegreeView[_Node]: ...
+ def __call__(self, nbunch: _NBunch[_Node] = None, weight: None | bool | str = None) -> int | DiDegreeView[_Node]: ...
  def __getitem__(self, n: _Node) -> float: ...
  def __iter__(self) -> Iterator[tuple[_Node, float]]: ...
  def __len__(self) -> int: ...

stubs/objgraph/METADATA.toml

@@ -0,0 +1,2 @@
+version = "3.6.*"
+upstream_repository = "https://github.com/mgedmin/objgraph"