Merge pull request #896 from jhance/if-expr-isinstance

Isinstance for if expressions

Author: JukkaL

mypy/checker.py

@@ -2097,10 +2097,23 @@ def find_isinstance_check(node: Node,
             if kind == ISINSTANCE_ALWAYS_TRUE:
                 kind = ISINSTANCE_OVERLAPPING
             return (var, type, AnyType(), kind)
+    elif isinstance(node, UnaryExpr) and node.op == 'not':
+        (var, type, elsetype, kind) = find_isinstance_check(node.expr, type_map, weak)
+        return (var, elsetype, type, invert_isinstance_kind(kind))
+
     # Not a supported isinstance check
     return None, AnyType(), AnyType(), -1
 
 
+def invert_isinstance_kind(kind: int) -> int:
+    if kind == ISINSTANCE_ALWAYS_TRUE:
+        return ISINSTANCE_ALWAYS_FALSE
+    elif kind == ISINSTANCE_ALWAYS_FALSE:
+        return ISINSTANCE_ALWAYS_TRUE
+    else:
+        return kind
+
+
 def get_isinstance_type(node: Node, type_map: Dict[Node, Type]) -> Type:
     type = type_map[node]
     if isinstance(type, FunctionLike):

mypy/checkexpr.py

@@ -1275,8 +1275,25 @@ def check_for_comp(self, e: Union[GeneratorExpr, DictionaryComprehension]) -> No
     def visit_conditional_expr(self, e: ConditionalExpr) -> Type:
         cond_type = self.accept(e.cond)
         self.check_not_void(cond_type, e)
-        if_type = self.accept(e.if_expr)
-        else_type = self.accept(e.else_expr, context=if_type)
+
+        # Gain type information from isinstance if it is there
+        # but only for the current expression
+        variable, inst_if_type, inst_else_type, kind = mypy.checker.find_isinstance_check(
+            e.cond,
+            self.chk.type_map,
+            self.chk.typing_mode_weak())
+        if variable:
+            self.chk.binder.push_frame()
+            self.chk.binder.push(variable, inst_if_type)
+            if_type = self.accept(e.if_expr)
+            self.chk.binder.pop_frame()
+            self.chk.binder.push_frame()
+            self.chk.binder.push(variable, inst_else_type)
+            else_type = self.accept(e.else_expr, context=if_type)
+            self.chk.binder.pop_frame()
+        else:
+            if_type = self.accept(e.if_expr)
+            else_type = self.accept(e.else_expr, context=if_type)
         return join.join_types(if_type, else_type)
 
     #

mypy/test/data/check-isinstance.test

@@ -708,3 +708,16 @@ x = B() # type: A
 if isinstance(x, B) and x.flag:
     pass
 [builtins fixtures/isinstancelist.py]
+[case testIsinstanceExpression]
+class A:
+    pass
+
+class B(A):
+    flag = 1
+
+x = B() # type: A
+
+x.flag if isinstance(x, B) else 0
+0 if not isinstance(x, B) else x.flag
+0 if isinstance(x, B) else x.flag # E: "A" has no attribute "flag"
+[builtins fixtures/isinstancelist.py]