Fix issues caused by rebase

Author: JukkaL

mypy/semanal.py

@@ -78,7 +78,6 @@
     NoneTyp, CallableType, Overloaded, Instance, Type, TypeVarType, AnyType,
     FunctionLike, UnboundType, TypeList, TypeVarDef, TypeType,
     TupleType, UnionType, StarType, EllipsisType, function_type, TypedDictType,
-    Void,
 )
 from mypy.nodes import implicit_module_attrs
 from mypy.typeanal import (
@@ -469,7 +468,7 @@ def find_type_variables_in_type(self, type: Type) -> List[Tuple[str, TypeVarExpr
                 result.extend(self.find_type_variables_in_type(item))
         elif isinstance(type, AnyType):
             pass
-        elif isinstance(type, (EllipsisType, TupleType, Void)):
+        elif isinstance(type, (EllipsisType, TupleType)):
             # TODO: Need to process tuple items?
             pass
         elif isinstance(type, Instance):
@@ -719,9 +718,8 @@ def analyze_class_body(self, defn: ClassDef) -> Iterator[bool]:
         if self.analyze_namedtuple_classdef(defn):
             # just analyze the class body so we catch type errors in default values
             self.enter_class(defn)
-            yield False
+            yield True
             self.leave_class()
-            return
         else:
             self.setup_class_def_analysis(defn)
 

mypy/server/astdiff.py

@@ -11,7 +11,7 @@
 
 from mypy.nodes import SymbolTable, SymbolTableNode, FuncBase, TypeInfo, Var
 from mypy.types import (
-    Type, TypeVisitor, UnboundType, ErrorType, TypeList, AnyType, Void, NoneTyp, UninhabitedType,
+    Type, TypeVisitor, UnboundType, TypeList, AnyType, NoneTyp, UninhabitedType,
     ErasedType, DeletedType, Instance, TypeVarType, CallableType, TupleType, TypedDictType,
     UnionType, Overloaded, PartialType, TypeType
 )
@@ -137,18 +137,12 @@ def __init__(self, right: Type) -> None:
     def visit_unbound_type(self, left: UnboundType) -> bool:
         return False
 
-    def visit_error_type(self, left: ErrorType) -> bool:
-        return False
-
     def visit_type_list(self, t: TypeList) -> bool:
         assert False, 'Not supported'
 
     def visit_any(self, left: AnyType) -> bool:
         return isinstance(self.right, AnyType)
 
-    def visit_void(self, left: Void) -> bool:
-        return isinstance(self.right, Void)
-
     def visit_none_type(self, left: NoneTyp) -> bool:
         return isinstance(self.right, NoneTyp)
 

mypy/server/astmerge.py

@@ -13,7 +13,7 @@
 from mypy.types import (
     Type, TypeVisitor, Instance, AnyType, NoneTyp, CallableType, DeletedType, PartialType,
     TupleType, TypeType, TypeVarType, TypedDictType, UnboundType, UninhabitedType, UnionType,
-    Void, Overloaded
+    Overloaded
 )
 
 
@@ -195,9 +195,6 @@ def visit_uninhabited_type(self, typ: UninhabitedType) -> None:
     def visit_union_type(self, typ: UnionType) -> None:
         raise NotImplementedError
 
-    def visit_void(self, typ: Void) -> None:
-        pass
-
     # Helpers
 
     def fixup(self, node: SN) -> SN:

mypy/server/deps.py

@@ -11,7 +11,7 @@
 from mypy.types import (
     Type, Instance, AnyType, NoneTyp, TypeVisitor, CallableType, DeletedType, PartialType,
     TupleType, TypeType, TypeVarType, TypedDictType, UnboundType, UninhabitedType, UnionType,
-    Void, FunctionLike
+    FunctionLike
 )
 from mypy.server.trigger import make_trigger
 
@@ -224,9 +224,6 @@ def visit_uninhabited_type(self, typ: UninhabitedType) -> List[str]:
     def visit_union_type(self, typ: UnionType) -> List[str]:
         raise NotImplementedError
 
-    def visit_void(self, typ: Void) -> List[str]:
-        return []
-
 
 def non_trivial_bases(info: TypeInfo) -> List[TypeInfo]:
     return [base for base in info.mro[1:]

mypy/server/subexpr.py

@@ -5,7 +5,7 @@
 from mypy.nodes import (
     Expression, Node, MemberExpr, YieldFromExpr, YieldExpr, CallExpr, OpExpr, ComparisonExpr,
     SliceExpr, CastExpr, RevealTypeExpr, UnaryExpr, ListExpr, TupleExpr, DictExpr, SetExpr,
-    IndexExpr, GeneratorExpr, ListComprehension, ConditionalExpr, TypeApplication, FuncExpr,
+    IndexExpr, GeneratorExpr, ListComprehension, ConditionalExpr, TypeApplication, LambdaExpr,
     StarExpr, BackquoteExpr, AwaitExpr
 )
 from mypy.traverser import TraverserVisitor
@@ -116,7 +116,7 @@ def visit_type_application(self, e: TypeApplication) -> None:
         self.add(e)
         super().visit_type_application(e)
 
-    def visit_func_expr(self, e: FuncExpr) -> None:
+    def visit_lambda_expr(self, e: LambdaExpr) -> None:
         self.add(e)
         super().visit_func_expr(e)
 

mypy/test/testmerge.py

@@ -191,6 +191,8 @@ def dump_types(self, graph: Dict[str, State]) -> List[str]:
         # To make the results repeatable, we try to generate unique and
         # deterministic sort keys.
         for module_id in sorted(graph):
+            if module_id == 'builtins':
+                continue
             type_map = graph[module_id].type_checker.type_map
             if type_map:
                 a.append('## {}'.format(module_id))

test-data/unit/fine-grained.test

@@ -383,7 +383,7 @@ main:3: error: "module" has no attribute "g"
 [case testAddBaseClassMethodCausingInvalidOverride]
 import m
 class B(m.A):
-    def f(self) -> None: pass
+    def f(self) -> str: pass
 [file m.py]
 class A: pass
 [file m.py.2]
@@ -396,10 +396,10 @@ main:3: error: Return type of "f" incompatible with supertype "A"
 [case testModifyBaseClassMethodCausingInvalidOverride]
 import m
 class B(m.A):
-    def f(self) -> None: pass
+    def f(self) -> str: pass
 [file m.py]
 class A:
-    def f(self) -> None: pass
+    def f(self) -> str: pass
 [file m.py.2]
 class A:
     def f(self) -> int: pass