Slight improvements

python · Gobot1234 · Aug 28, 2021 · Oct 2, 2021 · Nov 5, 2021 · Dec 5, 2021
commit b1d67ca043cb2f4fd3f37f6543ed95cb53ffebd3
diff --git a/mypy/semanal.py b/mypy/semanal.py
@@ -670,18 +670,38 @@ def prepare_method_signature(self, func: FuncDef, info: TypeInfo) -> None:
                 leading_type = func.type.arg_types[0]
                 if not isinstance(leading_type, (Instance, TypeType)):
                     return
-                self_type = leading_type if not func.is_class else leading_type.item
+                self_type = leading_type.item if isinstance(leading_type, TypeType) else leading_type
                 fullname = None
                 # bind any SelfTypes
                 for idx, arg in enumerate(func.type.arg_types):
                     if self.is_self_type(arg):
+                        if func.is_static:
+                            self.fail(
+                                "Self types in the annotations of staticmethods are not supported, "
+                                "please replace the type with {}".format(self_type.type.name),
+                                func
+                            )
+                            func.type.arg_types[idx] = self.named_type(
+                                self_type.type.name
+                            )  # we replace them here for them
+                            continue
                         if fullname is None:
                             fullname = self.lookup_qualified(arg.name, arg).node.fullname
                         func.type.arg_types[idx] = SelfType(self_type, fullname=fullname)
 
                 if self.is_self_type(func.type.ret_type):
                     if fullname is None:
+                        self.lookup_qualified(func.type.ret_type.name, func.type.ret_type)
                         fullname = self.lookup_qualified(func.type.ret_type.name, func.type.ret_type).node.fullname
+                    if func.is_static:
+                        self.fail(
+                            "Self types in the annotations of staticmethods are not supported, "
+                            "please replace the type with {}".format(self_type.type.name),
+                            func,
+                        )
+                        func.type.ret_type = self.named_type(self_type.type.name)
+                        return
+
                     func.type.ret_type = SelfType(self_type, fullname=fullname)
 
     def set_original_def(self, previous: Optional[Node], new: Union[FuncDef, Decorator]) -> bool:
@@ -3296,7 +3316,7 @@ def is_final_type(self, typ: Optional[Type]) -> bool:
             return False
         return sym.node.fullname in ('typing.Final', 'typing_extensions.Final')
 
-    def is_self_type(self, typ: Optional[Type]) -> None:
+    def is_self_type(self, typ: Optional[Type]) -> bool:
         if not isinstance(typ, UnboundType):
             return False
         sym = self.lookup_qualified(typ.name, typ)
@@ -3629,8 +3649,8 @@ def visit_name_expr(self, expr: NameExpr) -> None:
 
     def bind_name_expr(self, expr: NameExpr, sym: SymbolTableNode) -> None:
         """Bind name expression to a symbol table node."""
-        if sym.node.fullname in ('typing.Self', 'typing_extensions.Self') and not self.is_class_scope():
-            self.fail('{} is unbound'.format(expr.name), expr)
+        # if sym.node.fullname in ('typing.Self', 'typing_extensions.Self') and not self.is_class_scope():
+        #     self.fail('{} is unbound'.format(expr.name), expr)
         if isinstance(sym.node, TypeVarExpr) and self.tvar_scope.get_binding(sym):
             self.fail('"{}" is a type variable and only valid in type '
                       'context'.format(expr.name), expr)

diff --git a/mypy/types.py b/mypy/types.py
@@ -1055,7 +1055,6 @@ def __init__(self,
         else:
             self.def_extras = {}
         self.type_guard = type_guard
-        # self.created = __import__('inspect').stack()
 
     def copy_modified(self,
                       arg_types: Bogus[Sequence[Type]] = _dummy,