Merge branch 'cleanDistributeTuple' of https://github.com/VallinZ/mypy into cleanDistributeTuple

Author: ChristinaTrinh

test-data/unit/check-tuples.test

@@ -524,6 +524,46 @@ class A: pass
 class B: pass
 [builtins fixtures/tuple.pyi]
 
+# ----------------------------------------------------------------------------
+# Union-in-Tuple distribution
+# ----------------------------------------------------------------------------
+
+[case testTupleUnionDistributionSuccess]
+from typing import Tuple, Optional, Union
+
+def f1(x: Tuple[float, Optional[float]]) -> Union[Tuple[float, float], Tuple[float, None]]:
+    return x
+
+def f2(x: Tuple[Union[int, str], float]) -> Union[Tuple[int, float], Tuple[str, float]]:
+    return x
+
+def f3(x: Tuple[int, Union[str, None]]) -> Union[Tuple[int, str], Tuple[int, None]]:
+    return x
+
+def f4(x: Tuple[Union[int, float]]) -> Union[Tuple[int], Tuple[float]]:
+    return x
+
+def f5(x: Tuple[Union[int, str], Union[bool, None]]) -> Union[
+    Tuple[int, bool],
+    Tuple[int, None],
+    Tuple[str, bool],
+    Tuple[str, None],
+]:
+    return x
+
+[builtins fixtures/tuple.pyi]
+
+[case testTupleUnionDistributionFail]
+from typing import Tuple, Optional, Union
+
+def g1(x: Tuple[float, Optional[float]]) -> Union[Tuple[float, float], Tuple[str, float]]:
+    return x  # E: Incompatible return value type (got "Tuple[float, Optional[float]]", expected "Union[Tuple[float, float], Tuple[str, float]]")
+
+def g2(x: Tuple[float, Optional[float]]) -> Union[Tuple[float, str], Tuple[float, None]]:
+    return x  # E: Incompatible return value type (got "Tuple[float, Optional[float]]", expected "Union[Tuple[float, str], Tuple[float, None]]")
+
+[builtins fixtures/tuple.pyi]
+
 [case testMultipleAssignmentWithNonTupleRvalue]
 a: A
 b: B