Minor cleanup

python · ilevkivskyi · Nov 15, 2022 · Nov 7, 2022 · Nov 7, 2022 · Nov 7, 2022
commit 2ee66ec731a72c8fd59f5269edfb50f4c5326ad1
diff --git a/mypy/plugins/dataclasses.py b/mypy/plugins/dataclasses.py
@@ -52,10 +52,9 @@
     TypeVarType,
     get_proper_type,
 )
-
-# The set of decorators that generate dataclasses.
 from mypy.typevars import fill_typevars
 
+# The set of decorators that generate dataclasses.
 dataclass_makers: Final = {"dataclass", "dataclasses.dataclass"}
 # The set of functions that generate dataclass fields.
 field_makers: Final = {"dataclasses.field"}

diff --git a/mypy/semanal.py b/mypy/semanal.py
@@ -987,6 +987,12 @@ def update_function_type_variables(self, fun_type: CallableType, defn: FuncItem)
             return has_self_type
 
     def setup_self_type(self) -> None:
+        """Setup a (shared) Self type variable for current class.
+
+        We intentionally don't add it to the class symbol table,
+        so it can be accessed only by mypy and will not cause
+        clashes with user defined names.
+        """
         assert self.type is not None
         info = self.type
         if info.self_type is not None:
@@ -3142,7 +3148,8 @@ def process_type_annotation(self, s: AssignmentStmt) -> None:
                 s.type, lambda name: self.lookup_qualified(name, s, suppress_errors=True)
             )
             if has_self_type and self.type:
-                if self.type.typeddict_type or self.type.tuple_type:
+                if self.type.typeddict_type or self.type.is_named_tuple:
+                    # Annotations have special meaning in TypedDicts and NamedTuples.
                     return
                 self.setup_self_type()
             analyzed = self.anal_type(s.type, allow_tuple_literal=allow_tuple_literal)

diff --git a/mypy/semanal_namedtuple.py b/mypy/semanal_namedtuple.py
@@ -420,7 +420,7 @@ def parse_namedtuple_args(
         return items, types, defaults, typename, tvar_defs, True
 
     def parse_namedtuple_fields_with_types(
-        self, nodes: list[Expression], call: CallExpr, existing_info: TypeInfo | None
+        self, nodes: list[Expression], context: Context, existing_info: TypeInfo | None
     ) -> tuple[list[str], list[Type], list[Expression], bool] | None:
         """Parse typed named tuple fields.
 
@@ -449,7 +449,7 @@ def parse_namedtuple_fields_with_types(
                     type,
                     allow_placeholder=not self.options.disable_recursive_aliases
                     and not self.api.is_func_scope(),
-                    self_type_override=special_self_type(existing_info, call),
+                    self_type_override=special_self_type(existing_info, context),
                 )
                 # Workaround #4987 and avoid introducing a bogus UnboundType
                 if isinstance(analyzed, UnboundType):

diff --git a/mypy/semanal_typeddict.py b/mypy/semanal_typeddict.py
@@ -463,7 +463,7 @@ def parse_typeddict_args(
     def parse_typeddict_fields_with_types(
         self,
         dict_items: list[tuple[Expression | None, Expression]],
-        call: CallExpr,
+        context: Context,
         existing_info: TypeInfo | None,
     ) -> tuple[list[str], list[Type], bool] | None:
         """Parse typed dict items passed as pairs (name expression, type expression).
@@ -506,7 +506,7 @@ def parse_typeddict_fields_with_types(
                 allow_required=True,
                 allow_placeholder=not self.options.disable_recursive_aliases
                 and not self.api.is_func_scope(),
-                self_type_override=special_self_type(existing_info, call),
+                self_type_override=special_self_type(existing_info, context),
             )
             if analyzed is None:
                 return None

diff --git a/mypy/typeanal.py b/mypy/typeanal.py
@@ -235,7 +235,7 @@ def __init__(
         # Names of type aliases encountered while analysing a type will be collected here.
         self.aliases_used: set[str] = set()
         # Used by special forms like TypedDicts and NamedTuples, where Self type
-        # needs a special handling (for such types the target TypeInfo not be
+        # needs a special handling (for such types the target TypeInfo may not be
         # created yet when analyzing Self type, unlike for regular classes).
         self.self_type_override = self_type_override
 

diff --git a/test-data/unit/check-selftype.test b/test-data/unit/check-selftype.test
@@ -1424,3 +1424,11 @@ class D(C): ...
 
 reveal_type(C)  # N: Revealed type is "def (other: __main__.C) -> __main__.C"
 reveal_type(D)  # N: Revealed type is "def (other: __main__.D) -> __main__.D"
+
+[case testTypingSelfCorrectName]
+from typing import Self, List
+
+class C:
+    Self = List[C]
+    def meth(self) -> Self: ...
+reveal_type(C.meth)  # N: Revealed type is "def (self: __main__.C) -> builtins.list[__main__.C]"