Fix some more type errors under mypyc (#5585)

Add test cases for the constructs that triggered the trouble.

Author: msullivan

mypy/fastparse2.py

@@ -405,7 +405,7 @@ def transform_args(self,
                        n: ast27.arguments,
                        line: int,
                        ) -> Tuple[List[Argument], List[Statement]]:
-        type_comments = n.type_comments
+        type_comments = n.type_comments  # type: Sequence[Optional[str]]
         converter = TypeConverter(self.errors, line=line)
         decompose_stmts = []  # type: List[Statement]
 
@@ -432,8 +432,10 @@ def convert_arg(index: int, arg: ast27.expr) -> Var:
             return Var(v)
 
         def get_type(i: int) -> Optional[Type]:
-            if i < len(type_comments) and type_comments[i] is not None:
-                return converter.visit_raw_str(type_comments[i])
+            if i < len(type_comments):
+                comment = type_comments[i]
+                if comment is not None:
+                    return converter.visit_raw_str(comment)
             return None
 
         args = [(convert_arg(i, arg), get_type(i)) for i, arg in enumerate(n.args)]

mypy/semanal_namedtuple.py

@@ -239,7 +239,8 @@ def parse_namedtuple_args(self, call: CallExpr, fullname: str
                        for item in listexpr.items):
                     return self.fail_namedtuple_arg("String literal expected as namedtuple() item",
                                                     call)
-                items = [cast(StrExpr, item).value for item in listexpr.items]
+                items = [cast(Union[StrExpr, BytesExpr, UnicodeExpr], item).value
+                         for item in listexpr.items]
             else:
                 # The fields argument contains (name, type) tuples.
                 items, types, _, ok = self.parse_namedtuple_fields_with_types(listexpr.items, call)

test-data/unit/check-basic.test

@@ -364,3 +364,12 @@ f(x)
 [file mock.py]
 [builtins fixtures/isinstance.pyi]
 [out]
+
+[case testPartialTypeComments]
+def foo(
+    a,  # type: str
+    b,
+    args=None,
+):
+    # type: (...) -> None
+    pass

test-data/unit/check-namedtuple.test

@@ -20,6 +20,16 @@ a = x[1]
 a, b, c = x # E: Need more than 2 values to unpack (3 expected)
 x[2] # E: Tuple index out of range
 
+[case testNamedTupleUnicode_python2]
+from __future__ import unicode_literals
+from collections import namedtuple
+
+# This test is a regression test for a bug where mypyc-compiled mypy
+# would crash on namedtuple's with unicode arguments. Our test stubs
+# don't actually allow that, though, so we ignore the error and just
+# care we don't crash.
+X = namedtuple('X', ('x', 'y'))  # type: ignore
+
 [case testNamedTupleNoUnderscoreFields]
 from collections import namedtuple
 
@@ -55,9 +65,9 @@ a.y = 5 # E: Property "y" defined in "X" is read-only
 from typing import NamedTuple
 from typing_extensions import Protocol
 
-class HasX(Protocol): 
+class HasX(Protocol):
     x: str
-    
+
 class A(NamedTuple):
     x: str
 

test-data/unit/check-python2.test

@@ -324,3 +324,12 @@ class B(A):
     def g(self): # type: () -> None
         super(B, self).f()
         super().f() # E: Too few arguments for "super"
+
+[case testPartialTypeComments_python2]
+def foo(
+    a,  # type: str
+    b,
+    args=None,
+):
+    # type: (...) -> None
+    pass