Fixes to Callable[..., t] types

Closes #393.

Author: JukkaL

mypy/expandtype.py

@@ -77,13 +77,15 @@ def visit_type_var(self, t: TypeVarType) -> Type:
 
     def visit_callable_type(self, t: CallableType) -> Type:
         return CallableType(self.expand_types(t.arg_types),
-                        t.arg_kinds,
-                        t.arg_names,
-                        t.ret_type.accept(self),
-                        t.fallback,
-                        t.name,
-                        t.variables,
-                        self.expand_bound_vars(t.bound_vars), t.line)
+                            t.arg_kinds,
+                            t.arg_names,
+                            t.ret_type.accept(self),
+                            t.fallback,
+                            t.name,
+                            t.variables,
+                            self.expand_bound_vars(t.bound_vars),
+                            t.line,
+                            t.is_ellipsis_args)
 
     def visit_overloaded(self, t: Overloaded) -> Type:
         items = []  # type: List[CallableType]

mypy/sametypes.py

@@ -74,7 +74,8 @@ def visit_callable_type(self, left: CallableType) -> bool:
                     is_same_types(left.arg_types, cright.arg_types) and
                     left.arg_names == cright.arg_names and
                     left.arg_kinds == cright.arg_kinds and
-                    left.is_type_obj() == cright.is_type_obj())
+                    left.is_type_obj() == cright.is_type_obj() and
+                    left.is_ellipsis_args == cright.is_ellipsis_args)
         else:
             return False
 

mypy/test/data/check-functions.test

@@ -822,7 +822,7 @@ def g4(*, y: int) -> str: pass
 f(g1)
 f(g2)
 f(g3)
-f(g4) # E: Argument 1 to "f" has incompatible type Callable[..., str]; expected Callable[..., int]
+f(g4) # E: Argument 1 to "f" has incompatible type Callable[[int], str]; expected Callable[..., int]
 
 [case testCallableWithArbitraryArgsSubtypingWithGenericFunc]
 from typing import Callable, TypeVar

mypy/types.py

@@ -257,8 +257,8 @@ def __init__(self, arg_types: List[Type],
                  name: str = None,
                  variables: List[TypeVarDef] = None,
                  bound_vars: List[Tuple[int, Type]] = None,
-                 is_ellipsis_args: bool = False,
-                 line: int = -1) -> None:
+                 line: int = -1,
+                 is_ellipsis_args: bool = False) -> None:
         if variables is None:
             variables = []
         if not bound_vars:
@@ -575,7 +575,8 @@ def visit_callable_type(self, t: CallableType) -> Type:
                         t.name,
                         self.translate_variables(t.variables),
                         self.translate_bound_vars(t.bound_vars),
-                        t.line)
+                        t.line,
+                        t.is_ellipsis_args)
 
     def visit_tuple_type(self, t: TupleType) -> Type:
         return TupleType(self.translate_types(t.items),