Support multiplying tuple with an integer

Work towards python#863.
JamesGuthrie · Sep 15, 2015 · f01a1e6 · f01a1e6
1 parent ba76080
commit f01a1e6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py
@@ -1265,6 +1265,8 @@ def has_member(self, typ: Type, member: str) -> bool:
         elif isinstance(typ, UnionType):
             result = all(self.has_member(x, member) for x in typ.items)
             return result
+        elif isinstance(typ, TupleType):
+            return self.has_member(typ.fallback, member)
         else:
             return False
 

diff --git a/mypy/test/data/pythoneval.test b/mypy/test/data/pythoneval.test
@@ -1048,3 +1048,17 @@ _program.py: note: In function "p":
 _program.py:6: error: "str" not callable
 _program.py: note: At top level:
 _program.py:8: error: Argument 1 to "startswith" of "str" has incompatible type "Tuple[str, bytes]"; expected "Union[str, Tuple[str, ...]]"
+
+[case testMultiplyTupleByInteger]
+n = 4
+t = ('',) * n
+t + 1
+[out]
+_program.py:3: error: Unsupported operand types for + (Tuple[str, ...] and "int")
+
+[case testMultiplyTupleByIntegerReverse]
+n = 4
+t = n * ('',)
+t + 1
+[out]
+_program.py:3: error: Unsupported operand types for + (Tuple[str, ...] and "int")
diff --git a/stubs/2.7/builtins.pyi b/stubs/2.7/builtins.pyi
@@ -546,6 +546,8 @@ class tuple(Sequence[_T_co], Generic[_T_co]):
     def __gt__(self, x: Tuple[_T_co, ...]) -> bool: ...
     def __ge__(self, x: Tuple[_T_co, ...]) -> bool: ...
     def __add__(self, x: Tuple[_T_co, ...]) -> Tuple[_T_co, ...]: ...
+    def __mul__(self, n: int) -> Tuple[_T_co, ...]: ...
+    def __rmul__(self, n: int) -> Tuple[_T_co, ...]: ...
     def count(self, x: Any) -> int: ...
     def index(self, x: Any) -> int: ...
 

diff --git a/stubs/3.2/builtins.pyi b/stubs/3.2/builtins.pyi
@@ -417,6 +417,8 @@ class tuple(Sequence[_T_co], Generic[_T_co]):
     def __gt__(self, x: Tuple[_T_co, ...]) -> bool: ...
     def __ge__(self, x: Tuple[_T_co, ...]) -> bool: ...
     def __add__(self, x: Tuple[_T_co, ...]) -> Tuple[_T_co, ...]: ...
+    def __mul__(self, n: int) -> Tuple[_T_co, ...]: ...
+    def __rmul__(self, n: int) -> Tuple[_T_co, ...]: ...
     def count(self, x: Any) -> int: ...
     def index(self, x: Any) -> int: ...