From 64e9c0d87a2da45162a89a53ed1b31bfe8b78795 Mon Sep 17 00:00:00 2001 From: Jukka Lehtosalo Date: Mon, 30 May 2022 11:46:50 +0100 Subject: [PATCH 1/4] Update version to 0.961+dev --- mypy/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mypy/version.py b/mypy/version.py index 587e881b413b3..d0c9d31a3b635 100644 --- a/mypy/version.py +++ b/mypy/version.py @@ -5,7 +5,7 @@ # - Release versions have the form "0.NNN". # - Dev versions have the form "0.NNN+dev" (PLUS sign to conform to PEP 440). # - For 1.0 we'll switch back to 1.2.3 form. -__version__ = '0.960' +__version__ = '0.961+dev' base_version = __version__ mypy_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) From f649e2d400b53936c458f620ff112add6047316c Mon Sep 17 00:00:00 2001 From: Jukka Lehtosalo Date: Thu, 26 May 2022 14:43:40 +0100 Subject: [PATCH 2/4] Fix crash with nested attrs class (#12872) Fixes #12868. --- mypy/semanal.py | 4 +++- test-data/unit/check-attr.test | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/mypy/semanal.py b/mypy/semanal.py index a49e7c23edf57..e00913a8cde46 100644 --- a/mypy/semanal.py +++ b/mypy/semanal.py @@ -4505,7 +4505,9 @@ class C: """ # TODO: Forward reference to name imported in class body is not # caught. - assert self.statement # we are at class scope + if self.statement is None: + # Assume it's fine -- don't have enough context to check + return True return (node is None or self.is_textually_before_statement(node) or not self.is_defined_in_current_module(node.fullname) diff --git a/test-data/unit/check-attr.test b/test-data/unit/check-attr.test index fdb0da7e0fce4..021be93bdd21d 100644 --- a/test-data/unit/check-attr.test +++ b/test-data/unit/check-attr.test @@ -1734,3 +1734,18 @@ class C: # E: Unsupported converter, only named functions and types are currently supported ) [builtins fixtures/dict.pyi] + +[case testAttrsNestedClass] +from typing import List +import attr + +@attr.s +class C: + @attr.s + class D: + pass + x = attr.ib(type=List[D]) + +c = C(x=[C.D()]) +reveal_type(c.x) # N: Revealed type is "builtins.list[__main__.C.D]" +[builtins fixtures/list.pyi] From 154ac75150c9339b081218da08588ea01e9b9bc6 Mon Sep 17 00:00:00 2001 From: Jukka Lehtosalo Date: Mon, 30 May 2022 13:08:01 +0100 Subject: [PATCH 3/4] Run dataclass plugin before checking type var bounds (#12908) The plugin may add attributes that are needed to perform the bound check. Fixes #12876. --- mypy/semanal_main.py | 7 +++---- test-data/unit/check-dataclasses.test | 18 +++++++++++++++++ test-data/unit/fine-grained.test | 28 +++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/mypy/semanal_main.py b/mypy/semanal_main.py index bb0af8edc46f6..305d1a058d76f 100644 --- a/mypy/semanal_main.py +++ b/mypy/semanal_main.py @@ -82,10 +82,10 @@ def semantic_analysis_for_scc(graph: 'Graph', scc: List[str], errors: Errors) -> # We use patch callbacks to fix up things when we expect relatively few # callbacks to be required. apply_semantic_analyzer_patches(patches) - # This pass might need fallbacks calculated above. - check_type_arguments(graph, scc, errors) # Run class decorator hooks (they requite complete MROs and no placeholders). apply_class_plugin_hooks(graph, scc, errors) + # This pass might need fallbacks calculated above and the results of hooks. + check_type_arguments(graph, scc, errors) calculate_class_properties(graph, scc, errors) check_blockers(graph, scc) # Clean-up builtins, so that TypeVar etc. are not accessible without importing. @@ -133,10 +133,9 @@ def semantic_analysis_for_targets( process_top_level_function(analyzer, state, state.id, n.node.fullname, n.node, n.active_typeinfo, patches) apply_semantic_analyzer_patches(patches) - + apply_class_plugin_hooks(graph, [state.id], state.manager.errors) check_type_arguments_in_targets(nodes, state, state.manager.errors) calculate_class_properties(graph, [state.id], state.manager.errors) - apply_class_plugin_hooks(graph, [state.id], state.manager.errors) def restore_saved_attrs(saved_attrs: SavedAttributes) -> None: diff --git a/test-data/unit/check-dataclasses.test b/test-data/unit/check-dataclasses.test index 972cc4d40a1e2..fb1b4a1e8b464 100644 --- a/test-data/unit/check-dataclasses.test +++ b/test-data/unit/check-dataclasses.test @@ -1772,3 +1772,21 @@ c = C() c2 = C(x=1) c.x # E: "C" has no attribute "x" [builtins fixtures/dataclasses.pyi] + +[case testDataclassCheckTypeVarBounds] +# flags: --python-version 3.7 +from dataclasses import dataclass +from typing import Protocol, Dict, TypeVar, Generic + +class DataclassProtocol(Protocol): + __dataclass_fields__: Dict + +T = TypeVar("T", bound=DataclassProtocol) + +@dataclass +class MyDataclass: + x: int = 1 + +class MyGeneric(Generic[T]): ... +class MyClass(MyGeneric[MyDataclass]): ... +[builtins fixtures/dataclasses.pyi] diff --git a/test-data/unit/fine-grained.test b/test-data/unit/fine-grained.test index fa6dc52262ddd..c2bd67320f3ff 100644 --- a/test-data/unit/fine-grained.test +++ b/test-data/unit/fine-grained.test @@ -9734,6 +9734,7 @@ class C: [out] == main:5: error: Unsupported left operand type for + ("str") + [case testNoneAttribute] from typing import Generic, TypeVar @@ -9759,3 +9760,30 @@ class ExampleClass(Generic[T]): self.example_attribute = None [out] == + +[case testDataclassCheckTypeVarBoundsInReprocess] +# flags: --python-version 3.7 +from dataclasses import dataclass +from typing import Protocol, Dict, TypeVar, Generic +from m import x + +class DataclassProtocol(Protocol): + __dataclass_fields__: Dict + +T = TypeVar("T", bound=DataclassProtocol) + +@dataclass +class MyDataclass: + x: int = 1 + +class MyGeneric(Generic[T]): ... +class MyClass(MyGeneric[MyDataclass]): ... + +[file m.py] +x: int +[file m.py.2] +x: str + +[builtins fixtures/dataclasses.pyi] +[out] +== From 89bdcfb8c658340dae70312c5b76b703838d8123 Mon Sep 17 00:00:00 2001 From: Jukka Lehtosalo Date: Mon, 6 Jun 2022 14:01:41 +0100 Subject: [PATCH 4/4] Update version to 0.961 --- mypy/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mypy/version.py b/mypy/version.py index d0c9d31a3b635..2bbf9387db105 100644 --- a/mypy/version.py +++ b/mypy/version.py @@ -5,7 +5,7 @@ # - Release versions have the form "0.NNN". # - Dev versions have the form "0.NNN+dev" (PLUS sign to conform to PEP 440). # - For 1.0 we'll switch back to 1.2.3 form. -__version__ = '0.961+dev' +__version__ = '0.961' base_version = __version__ mypy_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))