Merge branch 'main' into PEP695

python · Oct 29, 2024 · 2166297 · 2166297
2 parents 14ca7bf + b633be4
commit 2166297
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/conformance/results/mypy/generics_syntax_infer_variance.toml b/conformance/results/mypy/generics_syntax_infer_variance.toml
@@ -55,6 +55,8 @@ generics_syntax_infer_variance.py:86: error: The type "type[ShouldBeCovariant6]"
 generics_syntax_infer_variance.py:89: error: Free type variable expected in Generic[...]  [misc]
 generics_syntax_infer_variance.py:90: error: Variable "generics_syntax_infer_variance.T" is not valid as a type  [valid-type]
 generics_syntax_infer_variance.py:90: note: See https://mypy.readthedocs.io/en/stable/common_issues.html#variables-vs-type-aliases
+generics_syntax_infer_variance.py:94: error: Variable "generics_syntax_infer_variance.T" is not valid as a type  [valid-type]
+generics_syntax_infer_variance.py:94: note: See https://mypy.readthedocs.io/en/stable/common_issues.html#variables-vs-type-aliases
 generics_syntax_infer_variance.py:98: error: Variable "generics_syntax_infer_variance.T" is not valid as a type  [valid-type]
 generics_syntax_infer_variance.py:98: note: See https://mypy.readthedocs.io/en/stable/common_issues.html#variables-vs-type-aliases
 generics_syntax_infer_variance.py:102: error: "ShouldBeInvariant1" expects no type arguments, but 1 given  [type-arg]
@@ -121,6 +123,7 @@ Line 81: Unexpected errors ['generics_syntax_infer_variance.py:81: error: Variab
 Line 85: Unexpected errors ['generics_syntax_infer_variance.py:85: error: "ShouldBeCovariant6" expects no type arguments, but 1 given  [type-arg]', 'generics_syntax_infer_variance.py:85: error: The type "type[ShouldBeCovariant6]" is not generic and not indexable  [misc]']
 Line 89: Unexpected errors ['generics_syntax_infer_variance.py:89: error: Free type variable expected in Generic[...]  [misc]']
 Line 90: Unexpected errors ['generics_syntax_infer_variance.py:90: error: Variable "generics_syntax_infer_variance.T" is not valid as a type  [valid-type]']
+Line 94: Unexpected errors ['generics_syntax_infer_variance.py:94: error: Variable "generics_syntax_infer_variance.T" is not valid as a type  [valid-type]']
 Line 98: Unexpected errors ['generics_syntax_infer_variance.py:98: error: Variable "generics_syntax_infer_variance.T" is not valid as a type  [valid-type]']
 Line 106: Unexpected errors ['generics_syntax_infer_variance.py:106: error: Free type variable expected in Generic[...]  [misc]']
 Line 107: Unexpected errors ['generics_syntax_infer_variance.py:107: error: Variable "generics_syntax_infer_variance.T" is not valid as a type  [valid-type]']

diff --git a/conformance/results/pyre/version.toml b/conformance/results/pyre/version.toml
@@ -1,2 +1,3 @@
 version = "pyre 0.9.23"
 test_duration = 9.1
+
diff --git a/conformance/results/pyright/version.toml b/conformance/results/pyright/version.toml
@@ -1,2 +1,3 @@
 version = "pyright 1.1.386"
 test_duration = 2.0
+
diff --git a/conformance/tests/generics_syntax_infer_variance.py b/conformance/tests/generics_syntax_infer_variance.py
@@ -91,7 +91,7 @@ def __init__(self, value: T) -> None:
         self._value = value
 
     @property
-    def value(self):
+    def value(self) -> T:
         return self._value
 
     @value.setter

diff --git a/docs/spec/typeddict.rst b/docs/spec/typeddict.rst
@@ -35,6 +35,7 @@ particular, :term:`assignability <assignable>` should be :term:`structural`: a
 more specific TypedDict type can be assignable to a more general TypedDict
 type, without any inheritance relationship between them.
 
+.. _typeddict-class-based-syntax:
 
 Class-based Syntax
 ^^^^^^^^^^^^^^^^^^
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,3 @@
		version = "pyright 1.1.386"
		test_duration = 2.0