Merge branch 'ecprice-breaking_out'

JukkaL · JukkaL · commit ad400e3faa71 · 2015-10-20T22:26:54.000-07:00
diff --git a/mypy/checker.py b/mypy/checker.py
@@ -1737,9 +1737,7 @@ def visit_name_expr(self, e: NameExpr) -> Type:
         return self.expr_checker.visit_name_expr(e)
 
     def visit_call_expr(self, e: CallExpr) -> Type:
-        result = self.expr_checker.visit_call_expr(e)
-        self.breaking_out = False
-        return result
+        return self.expr_checker.visit_call_expr(e)
 
     def visit_yield_from_expr(self, e: YieldFromExpr) -> Type:
         # result = self.expr_checker.visit_yield_from_expr(e)
diff --git a/mypy/test/data/check-isinstance.test b/mypy/test/data/check-isinstance.test
@@ -761,3 +761,15 @@ y = C() # type: A
 if isinstance(x, B) and isinstance(y, int):
     1() # type checking skipped
 [builtins fixtures/isinstancelist.py]
+
+[case testReturnWithCallExprAndIsinstance]
+
+from typing import Union
+def f(x: Union[int, str]) -> None:
+    if not isinstance(x, int):
+        return foo()
+    x()  # E: "int" not callable
+def foo(): pass
+[builtins fixtures/isinstancelist.py]
+[out]
+main: note: In function "f":
diff --git a/mypy/test/data/check-statements.test b/mypy/test/data/check-statements.test
@@ -6,18 +6,15 @@
 import typing
 def f() -> 'A':
     return A()
-    return B()
 def g() -> 'B':
     return A()
 class A:
     pass
 class B:
     pass
 [out]
-main: note: In function "f":
-main:4: error: Incompatible return value type: expected __main__.A, got __main__.B
 main: note: In function "g":
-main:6: error: Incompatible return value type: expected __main__.B, got __main__.A
+main:5: error: Incompatible return value type: expected __main__.B, got __main__.A
 
 [case testReturnSubtype]
 import typing
