Merge branch 'main' into pep728

Author: JelleZijlstra

conformance/results/mypy/dataclasses_match_args.toml

@@ -0,0 +1,7 @@
+conformant = "Pass"
+conformance_automated = "Pass"
+errors_diff = """
+"""
+output = """
+dataclasses_match_args.py:42: error: "type[DC4]" has no attribute "__match_args__"  [attr-defined]
+"""

conformance/results/mypy/version.toml

@@ -1,2 +1,2 @@
 version = "mypy 1.17.1"
-test_duration = 2.02
+test_duration = 2.04

conformance/results/pyre/dataclasses_match_args.toml

@@ -0,0 +1,12 @@
+conformant = "Partial"
+notes = """
+Adds kw-only fields to __match_args__.
+"""
+conformance_automated = "Fail"
+errors_diff = """
+Line 18: Unexpected errors ["dataclasses_match_args.py:18:0 Assert type [70]: Expected `Tuple[typing_extensions.Literal['x']]` but got `Tuple[typing_extensions.Literal['x'], typing_extensions.Literal['*'], typing_extensions.Literal['y']]`."]
+"""
+output = """
+dataclasses_match_args.py:18:0 Assert type [70]: Expected `Tuple[typing_extensions.Literal['x']]` but got `Tuple[typing_extensions.Literal['x'], typing_extensions.Literal['*'], typing_extensions.Literal['y']]`.
+dataclasses_match_args.py:42:0 Undefined attribute [16]: `DC4` has no attribute `__match_args__`.
+"""

conformance/results/pyre/version.toml

@@ -1,2 +1,2 @@
 version = "pyre 0.9.25"
-test_duration = 10.22
+test_duration = 10.27

conformance/results/pyright/dataclasses_match_args.toml

@@ -0,0 +1,10 @@
+conformant = "Partial"
+notes = """
+Generates __match_args__ when match_args=False.
+"""
+conformance_automated = "Fail"
+errors_diff = """
+Line 42: Expected 1 errors
+"""
+output = """
+"""

conformance/results/pyright/version.toml

@@ -1,2 +1,2 @@
 version = "pyright 1.1.403"
-test_duration = 1.31
+test_duration = 1.83

conformance/results/results.html

@@ -744,6 +744,12 @@ <h3>Python Type System Conformance Test Results</h3>
 <th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>Rejects legitimate use of dataclass field with `kw_only=True`.</p></span></div></th>
 <th class="column col2 conformant">Pass</th>
 </tr>
+<tr><th class="column col1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dataclasses_match_args</th>
+<th class="column col2 conformant">Pass</th>
+<th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>Generates __match_args__ when match_args=False.</p></span></div></th>
+<th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>Adds kw-only fields to __match_args__.</p></span></div></th>
+<th class="column col2 conformant">Pass</th>
+</tr>
 <tr><th class="column col1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dataclasses_order</th>
 <th class="column col2 conformant">Pass</th>
 <th class="column col2 conformant">Pass</th>

conformance/results/zuban/dataclasses_match_args.toml

@@ -0,0 +1,7 @@
+conformant = "Pass"
+conformance_automated = "Pass"
+errors_diff = """
+"""
+output = """
+dataclasses_match_args.py:42: error: "Type[DC4]" has no attribute "__match_args__"
+"""

conformance/tests/dataclasses_match_args.py

@@ -0,0 +1,49 @@
+"""
+Tests the match_args feature of dataclass added in Python 3.10.
+"""
+
+# Specification: https://docs.python.org/3/library/dataclasses.html#module-contents
+
+from dataclasses import dataclass, KW_ONLY
+from typing import assert_type, Literal
+
+# If true, the __match_args__ tuple will be created from the list of non keyword-only parameters to the generated __init__() method
+
+@dataclass(match_args=True)
+class DC1:
+    x: int
+    _: KW_ONLY
+    y: str
+
+assert_type(DC1.__match_args__, tuple[Literal['x']])
+
+# The match_args default is True
+
+@dataclass
+class DC2:
+    x: int
+
+assert_type(DC2.__match_args__, tuple[Literal['x']])
+
+# __match_args__ is created even if __init__() is not generated
+
+@dataclass(match_args=True, init=False)
+class DC3:
+    x: int = 0
+
+assert_type(DC3.__match_args__, tuple[Literal['x']])
+
+# If false, or if __match_args__ is already defined in the class, then __match_args__ will not be generated.
+
+@dataclass(match_args=False)
+class DC4:
+    x: int
+
+DC4.__match_args__  # E
+
+@dataclass(match_args=True)
+class DC5:
+    __match_args__ = ()
+    x: int
+
+assert_type(DC5.__match_args__, tuple[()])

docs/guides/writing_stubs.rst

@@ -5,7 +5,8 @@ Writing and Maintaining Stub Files
 **********************************
 
 Stub files are a means of providing type information for Python modules.
-For a full reference, refer to :ref:`stub-files`.
+For a quick introduction, see :ref:`external_libraries`. For a full reference,
+refer to :ref:`distributing-type`.
 
 Maintaining stubs can be a little cumbersome because they are separated from the
 implementation. This page lists some tools that make writing and maintaining