Merge branch 'master' into bugfix/14685-attrs-self-handling

python · davfsa · Feb 13, 2023 · Feb 13, 2023 · Feb 14, 2023 · Feb 14, 2023
commit c40674ba973e03610f25869159a2cc1dde47ba9b
diff --git a/mypy/plugins/attrs.py b/mypy/plugins/attrs.py
@@ -6,6 +6,7 @@
 from typing_extensions import Final, Literal
 
 import mypy.plugin  # To avoid circular imports.
+from mypy.errorcodes import LITERAL_REQ
 from mypy.expandtype import expand_self_type
 from mypy.exprtotype import TypeTranslationError, expr_to_unanalyzed_type
 from mypy.nodes import (

diff --git a/mypy/plugins/dataclasses.py b/mypy/plugins/dataclasses.py
@@ -4,6 +4,7 @@
 
 from typing_extensions import Final
 
+from mypy import errorcodes, message_registry
 from mypy.expandtype import expand_self_type
 from mypy.nodes import (
     ARG_NAMED,
@@ -113,7 +114,10 @@ def to_argument(self, current_info: TypeInfo) -> Argument:
         )
 
     def to_var(self, current_info: TypeInfo) -> Var:
-        return Var(self.name, expand_self_type(self.type, self.info, fill_typevars(current_info)))
+        return Var(
+            self.alias or self.name,
+            expand_self_type(self.type, self.info, fill_typevars(current_info)),
+        )
 
     def serialize(self) -> JsonDict:
         assert self.type