Merge branch 'main' into overload

Author: rchen152

conformance/results/mypy/dataclasses_descriptors.toml

@@ -1,5 +1,6 @@
 conformant = "Partial"
 notes = """
+Assumes descriptor behavior only when field is assigned in class body.
 Does not correctly evaluate type of descriptor access.
 """
 output = """

conformance/results/mypy/tuples_type_compat.toml

@@ -1,6 +1,7 @@
 conformant = "Partial"
 notes = """
 Does not support tuple narrowing based on `len()` type guard (optional).
+Incorrectly marks a match case as unreachable.
 """
 output = """
 tuples_type_compat.py:15: error: Incompatible types in assignment (expression has type "tuple[float, complex]", variable has type "tuple[int, int]")  [assignment]

conformance/results/results.html

@@ -814,7 +814,7 @@ <h3>Python Type System Conformance Test Results</h3>
 <a class="test_group" href="https://typing.readthedocs.io/en/latest/spec/dataclasses.html">Dataclasses</a>
 </th></tr>
 <tr><th class="column col1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dataclasses_descriptors</th>
-<th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>Does not correctly evaluate type of descriptor access.</p></span></div></th>
+<th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>Assumes descriptor behavior only when field is assigned in class body.</p><p>Does not correctly evaluate type of descriptor access.</p></span></div></th>
 <th class="column col2 conformant">Pass</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>* Assumes descriptor behavior only when field is assigned in class body</p><p>* Doesn't allow non-data descriptors or data descriptors with differing `__get__` and `__set__` types</p></span></div></th>
@@ -1030,7 +1030,7 @@ <h3>Python Type System Conformance Test Results</h3>
 <a class="test_group" href="https://typing.readthedocs.io/en/latest/spec/tuples.html">Tuples</a>
 </th></tr>
 <tr><th class="column col1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tuples_type_compat</th>
-<th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>Does not support tuple narrowing based on `len()` type guard (optional).</p></span></div></th>
+<th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>Does not support tuple narrowing based on `len()` type guard (optional).</p><p>Incorrectly marks a match case as unreachable.</p></span></div></th>
 <th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>Incorrectly marks a match case as unreachable.</p></span></div></th>
 <th class="column col2 conformant">Pass</th>
 <th class="column col2 conformant">Pass</th>

conformance/tests/dataclasses_transform_meta.py

@@ -25,8 +25,8 @@ def model_field(
 class ModelMeta(type):
     not_a_field: str
 
-    def __init__(self, not_a_field: str) -> None:
-        self.not_a_field = not_a_field
+    def __init__(self, *args, **kwargs) -> None:
+        self.not_a_field: str = "not a field"
 
 
 class ModelBase(metaclass=ModelMeta):

conformance/tests/protocols_class_objects.py

@@ -93,8 +93,8 @@ class ConcreteC2:
 class CMeta(type):
     attr1: int
 
-    def __init__(self, attr1: int) -> None:
-        self.attr1 = attr1
+    def __init__(self, *args, **kwargs) -> None:
+        self.attr1: int = 1
 
 
 class ConcreteC3(metaclass=CMeta):

docs/spec/enums.rst

@@ -78,7 +78,7 @@ behaviors::
     reveal_type(Color["RED"])  # Revealed type is 'Literal[Color.RED]' (or 'Color')
     reveal_type(Color(3))  # Revealed type is 'Literal[Color.BLUE]' (or 'Color')
 
-Unlike most Python classes, Calling an enum class does not invoke its constructor.
+Unlike most Python classes, calling an enum class does not invoke its constructor.
 Instead, the call performs a value-based lookup of an enum member.
 
 An Enum class with one or more defined members cannot be subclassed. They are
@@ -266,10 +266,10 @@ tuple values and the constructor signature::
             self.mass = mass
             self.radius = radius
 
-        MERCURY = (1, 3.303e+23, 2.4397e6)
-        VENUS = (2, 4.869e+24, 6.0518e6)
-        EARTH = (3, 5.976e+24, 6.37814e6)
-        MARS = (6.421e+23, 3.3972e6)  # Type checker error (optional)
+        MERCURY = (1, 3.301e+23, 2.4397e6)
+        VENUS = (2, 4.867e+24, 6.0518e6)
+        EARTH = (3, 5.972e+24, 6.37814e6)
+        MARS = (6.417e+23, 3.3962e6)  # Type checker error (optional)
         JUPITER = 5  # Type checker error (optional)
 
     reveal_type(Planet.MERCURY.value)  # Revealed type is Literal[1] (or int or object or Any)
@@ -302,7 +302,7 @@ checkers should enforce this declared type when values are assigned to
         def __init__(self, value: int, mass: float, radius: float):
             self._value_ = value # Type error
 
-        MERCURY = (1, 3.303e+23, 2.4397e6)
+        MERCURY = (1, 3.301e+23, 2.4397e6)
 
 If the literal values for enum members are not supplied, as they sometimes
 are not within a type stub file, a type checker can use the type of the