Update error messages

Author: pkch

mypy/messages.py

@@ -253,7 +253,7 @@ def format_simple(self, typ: Type, verbosity: int = 0) -> str:
                 base_str = itype.type.fullname()
             else:
                 base_str = itype.type.name()
-            if itype.args == [] or len(itype.args) == 1 and type(itype.args[0]) == AnyType:
+            if itype.args == []:
                 # No type arguments. Place the type name in quotes to avoid
                 # potential for confusion: otherwise, the type name could be
                 # interpreted as a normal word.

test-data/unit/check-async-await.test

@@ -93,7 +93,7 @@ async def f() -> int:
     return x
 [typing fixtures/typing-full.pyi]
 [out]
-main:7: error: Incompatible types in await (actual type Generator[int, None, str], expected type "Awaitable")
+main:7: error: Incompatible types in await (actual type Generator[int, None, str], expected type Awaitable[Any])
 
 [case testAwaitIteratorError]
 
@@ -105,7 +105,7 @@ async def f() -> int:
     return x
 [typing fixtures/typing-full.pyi]
 [out]
-main:6: error: Incompatible types in await (actual type "Iterator", expected type "Awaitable")
+main:6: error: Incompatible types in await (actual type Iterator[Any], expected type Awaitable[Any])
 
 [case testAwaitArgumentError]
 
@@ -117,7 +117,7 @@ async def f() -> int:
 [builtins fixtures/async_await.pyi]
 [typing fixtures/typing-full.pyi]
 [out]
-main:5: error: Incompatible types in await (actual type "int", expected type "Awaitable")
+main:5: error: Incompatible types in await (actual type "int", expected type Awaitable[Any])
 
 [case testAwaitResultError]
 
@@ -290,7 +290,7 @@ class C:
     def __aenter__(self) -> int: pass
     async def __aexit__(self, x, y, z) -> None: pass
 async def f() -> None:
-    async with C() as x:  # E: Incompatible types in "async with" for __aenter__ (actual type "int", expected type "Awaitable")
+    async with C() as x:  # E: Incompatible types in "async with" for __aenter__ (actual type "int", expected type Awaitable[Any])
         pass
 [builtins fixtures/async_await.pyi]
 [typing fixtures/typing-full.pyi]
@@ -312,7 +312,7 @@ class C:
     async def __aenter__(self) -> int: pass
     def __aexit__(self, x, y, z) -> int: pass
 async def f() -> None:
-    async with C() as x: # E: Incompatible types in "async with" for __aexit__ (actual type "int", expected type "Awaitable")
+    async with C() as x: # E: Incompatible types in "async with" for __aexit__ (actual type "int", expected type Awaitable[Any])
         pass
 [builtins fixtures/async_await.pyi]
 [typing fixtures/typing-full.pyi]
@@ -644,11 +644,11 @@ def plain_host_generator() -> Generator[str, None, None]:
 
 async def plain_host_coroutine() -> None:
     x = 0
-    x = await plain_generator()  # E: Incompatible types in await (actual type Generator[str, None, int], expected type "Awaitable")
+    x = await plain_generator()  # E: Incompatible types in await (actual type Generator[str, None, int], expected type Awaitable[Any])
     x = await plain_coroutine()
     x = await decorated_generator()
     x = await decorated_coroutine()
-    x = await other_iterator()  # E: Incompatible types in await (actual type "It", expected type "Awaitable")
+    x = await other_iterator()  # E: Incompatible types in await (actual type "It", expected type Awaitable[Any])
     x = await other_coroutine()
 
 @coroutine
@@ -665,11 +665,11 @@ def decorated_host_generator() -> Generator[str, None, None]:
 @coroutine
 async def decorated_host_coroutine() -> None:
     x = 0
-    x = await plain_generator()  # E: Incompatible types in await (actual type Generator[str, None, int], expected type "Awaitable")
+    x = await plain_generator()  # E: Incompatible types in await (actual type Generator[str, None, int], expected type Awaitable[Any])
     x = await plain_coroutine()
     x = await decorated_generator()
     x = await decorated_coroutine()
-    x = await other_iterator()  # E: Incompatible types in await (actual type "It", expected type "Awaitable")
+    x = await other_iterator()  # E: Incompatible types in await (actual type "It", expected type Awaitable[Any])
     x = await other_coroutine()
 
 [builtins fixtures/async_await.pyi]

test-data/unit/check-functions.test

@@ -1480,7 +1480,7 @@ L = Callable[[Arg(name='x', type=int)], int] # ok
 # I have commented out the following test because I don't know how to expect the "defined here" note part of the error.
 # M = Callable[[Arg(gnome='x', type=int)], int]   E: Invalid type alias   E: Unexpected keyword argument "gnome" for "Arg"
 N = Callable[[Arg(name=None, type=int)], int] # ok
-O = Callable[[List[Arg(int)]], int]  # E: Invalid type alias  # E: Value of type "int" is not indexable  # E: Type expected within [...] # E: The type Type[list] is not generic and not indexable
+O = Callable[[List[Arg(int)]], int]  # E: Invalid type alias  # E: Value of type "int" is not indexable  # E: Type expected within [...] # E: The type Type[List[Any]] is not generic and not indexable
 P = Callable[[mypy_extensions.VarArg(int)], int] # ok
 Q = Callable[[Arg(int, type=int)], int]  # E: Invalid type alias  # E: Value of type "int" is not indexable  # E: "Arg" gets multiple values for keyword argument "type"
 R = Callable[[Arg(int, 'x', name='y')], int]  # E: Invalid type alias  # E: Value of type "int" is not indexable  # E: "Arg" gets multiple values for keyword argument "name"
@@ -1745,7 +1745,7 @@ f(1, thing_in_kwargs=["hey"])
 from typing import Tuple, Any
 def f(x, *args): # type: (...) -> None
     success_tuple_type = args # type: Tuple[Any, ...]
-    fail_tuple_type = args # type: None # E: Incompatible types in assignment (expression has type "tuple", variable has type None)
+    fail_tuple_type = args # type: None # E: Incompatible types in assignment (expression has type tuple, variable has type None)
 f(1, "hello")
 [builtins fixtures/tuple.pyi]
 [out]

test-data/unit/check-generic-subtyping.test

@@ -305,8 +305,8 @@ a = None # type: A
 c = None # type: C
 bc = None # type: B[C]
 
-a.x = c # E: Incompatible types in assignment (expression has type "C", variable has type "B")
-a.f(c)  # E: Argument 1 to "f" of "B" has incompatible type "C"; expected "B"
+a.x = c # E: Incompatible types in assignment (expression has type "C", variable has type B[Any])
+a.f(c)  # E: Argument 1 to "f" of "B" has incompatible type "C"; expected B[Any]
 a.x = bc
 a.f(bc)
 [out]
@@ -325,8 +325,8 @@ class B(Generic[T]):
 
 class A(B):
   def g(self) -> None:
-    self.x = c # E: Incompatible types in assignment (expression has type "C", variable has type "B")
-    self.f(c)  # E: Argument 1 to "f" of "B" has incompatible type "C"; expected "B"
+    self.x = c # E: Incompatible types in assignment (expression has type "C", variable has type B[Any])
+    self.f(c)  # E: Argument 1 to "f" of "B" has incompatible type "C"; expected B[Any]
     self.x = bc
     self.f(bc)
 

test-data/unit/check-generics.test

@@ -1504,7 +1504,7 @@ T = TypeVar('T')
 class C(Generic[T]):
     def __init__(self) -> None: pass
 x = C # type: Callable[[], C[int]]
-y = C # type: Callable[[], int] # E: Incompatible types in assignment (expression has type Type[C], variable has type Callable[[], int])
+y = C # type: Callable[[], int] # E: Incompatible types in assignment (expression has type Type[C[Any]], variable has type Callable[[], int])
 
 
 -- Special cases

test-data/unit/check-namedtuple.test

@@ -286,12 +286,12 @@ from typing import NamedTuple
 
 X = NamedTuple('X', [('x', int), ('y', str)])
 reveal_type(X._make([5, 'a']))  # E: Revealed type is 'Tuple[builtins.int, builtins.str, fallback=__main__.X]'
-X._make('a b')  # E: Argument 1 to X._make has incompatible type "str"; expected "Iterable"
+X._make('a b')  # E: Argument 1 to X._make has incompatible type "str"; expected Iterable[Any]
 
 -- # FIX: not a proper class method
 -- x = None  # type: X
 -- reveal_type(x._make([5, 'a']))  # E: Revealed type is 'Tuple[builtins.int, builtins.str, fallback=__main__.X]'
--- x._make('a b')  # E: Argument 1 to X._make has incompatible type "str"; expected "Iterable"
+-- x._make('a b')  # E: Argument 1 to X._make has incompatible type "str"; expected Iterable[Any]
 
 [builtins fixtures/list.pyi]
 

test-data/unit/check-tuples.test

@@ -91,7 +91,7 @@ from typing import Tuple
 t1 = None # type: Tuple[A, A]
 t2 = None # type: tuple
 
-t1 = t2 # E: Incompatible types in assignment (expression has type "tuple", variable has type "Tuple[A, A]")
+t1 = t2 # E: Incompatible types in assignment (expression has type tuple, variable has type "Tuple[A, A]")
 t2 = t1
 
 class A: pass
@@ -914,7 +914,7 @@ def f(a: Tuple) -> None: pass
 f(())
 f((1,))
 f(('', ''))
-f(0)  # E: Argument 1 to "f" has incompatible type "int"; expected "tuple"
+f(0)  # E: Argument 1 to "f" has incompatible type "int"; expected tuple
 [builtins fixtures/tuple.pyi]
 
 [case testTupleSingleton]

test-data/unit/check-type-checks.test

@@ -107,7 +107,7 @@ def f(x: object) -> None:
     if isinstance(x, C):
         x.f(1)
         x.f('')
-        x.g() # E: "C" has no attribute "g"
+        x.g() # E: C[Any] has no attribute "g"
     x.g() # E: "object" has no attribute "g"
 [builtins fixtures/isinstance.pyi]
 [out]