Fixed type errors.

Author: spkersten

mypy/nodes.py

@@ -1292,9 +1292,9 @@ def accept(self, visitor: NodeVisitor[T]) -> T:
         return visitor.visit_type_application(self)
 
 
-INVARIANT = 0
-COVARIANT = 1
-CONTRAVARIANT = 2
+INVARIANT = 0  # type: int
+COVARIANT = 1  # type: int
+CONTRAVARIANT = 2  # type: int
 
 class TypeVarExpr(SymbolNode):
     """Type variable expression TypeVar(...)."""

mypy/semanal.py

@@ -276,7 +276,7 @@ def find_type_variables_in_type(
 
         This effectively does partial name binding, results of which are mostly thrown away.
         """
-        result = []  # type: List[Tuple[str, List[Type]]]
+        result = []  # type: List[Tuple[str, TypeVarExpr]]
         if isinstance(type, UnboundType):
             name = type.name
             node = self.lookup_qualified(name, type)

mypy/subtypes.py

@@ -60,8 +60,6 @@ def is_equivalent(a: Type, b: Type,
 
 class SubtypeVisitor(TypeVisitor[bool]):
 
-    check_type_parameter = None  # Callable[[Type, Type, int], bool]
-
     def __init__(self, right: Type,
                  type_parameter_checker: TypeParameterChecker) -> None:
         self.right = right

mypy/typefixture.py

@@ -19,7 +19,7 @@ class TypeFixture:
     The members are initialized to contain various type-related values.
     """
 
-    def __init__(self, variance: int=COVARIANT):
+    def __init__(self, variance: int=COVARIANT) -> None:
         # The 'object' class
         self.oi = self.make_type_info('builtins.object')               # class object
         self.o = Instance(self.oi, [])                        # object
@@ -197,7 +197,7 @@ def make_type_info(self, name: str,
                     variance = variances[id-1]
                 else:
                     variance = COVARIANT
-                v.append(TypeVarDef(n, id, None, self.oi, variance=variance))
+                v.append(TypeVarDef(n, id, None, self.o, variance=variance))
             class_def.type_vars = v
 
         info = TypeInfo(SymbolTable(), class_def)