merge fix except Awaitable lookup

python · JukkaL · Sep 2, 2016 · Jul 6, 2016 · Jul 6, 2016 · Jul 6, 2016
commit 797835765b04796f2bf11ccbb48f60f55a4db34e
diff --git a/mypy/semanal.py b/mypy/semanal.py
@@ -75,7 +75,7 @@
 from mypy.errors import Errors, report_internal_error
 from mypy.types import (
     NoneTyp, CallableType, Overloaded, Instance, Type, TypeVarType, AnyType,
-    FunctionLike, UnboundType, TypeList, TypeVarDef, TypeVarDef, Void,
+    FunctionLike, UnboundType, TypeList, TypeVarDef, Void,
     replace_leading_arg_type, TupleType, UnionType, StarType, EllipsisType,
     NamedTupleType, TypeType
 )
@@ -1728,6 +1728,9 @@ def add_namedtuple_method(self, symbols: SymbolTable, info: TypeInfo, this_type:
         func.is_class = is_classmethod
         symbols[funcname] = SymbolTableNode(MDEF, func)
 
+    def make_argument(self, name: str, type: Type) -> Argument:
+        return Argument(Var(name), type, None, ARG_POS)
+
     def analyze_types(self, items: List[Node]) -> List[Type]:
         result = []  # type: List[Type]
         for node in items:

diff --git a/mypy/types.py b/mypy/types.py
@@ -1298,7 +1298,8 @@ def visit_tuple_type(self, t: TupleType) -> str:
         return 'Tuple[{}]'.format(s)
 
     def visit_namedtuple_type(self, t: NamedTupleType) -> str:
-        s = self.list_str(zip(t.attrs, t.items))
+        s = ', '.join('({}, {})'.format(repr(attr), item.accept(self))
+                    for attr, item in zip(t.attrs, t.items))
         return '{}[{}]'.format(t.name, s)
 
     def visit_star_type(self, t: StarType) -> str: