Fixed unreachable block crash

pkch · pkch · commit 62d0d0a205c5 · 2017-04-13T17:18:17.000-07:00
diff --git a/mypy/checker.py b/mypy/checker.py
@@ -2677,6 +2677,8 @@ def or_conditional_maps(m1: TypeMap, m2: TypeMap) -> TypeMap:
 
 def convert_to_typetype(type_map: TypeMap) -> TypeMap:
     converted_type_map = {}  # type: TypeMap
+    if type_map is None:
+        return None
     for expr, typ in type_map.items():
         if isinstance(typ, UnionType):
             converted_type_map[expr] = UnionType([TypeType(t) for t in typ.items])
diff --git a/test-data/unit/check-isinstance.test b/test-data/unit/check-isinstance.test
@@ -1423,8 +1423,28 @@ def f(x: Union[int, A], a: Type[A]) -> None:
 [builtins fixtures/isinstancelist.pyi]
 
 
+[case testIssubclassUnreachable]
+from typing import Type, Sequence, Union
+x: Type[str]
+if issubclass(x, int):
+    reveal_type(x)  # unreachable block
+
+
+class X: pass
+class Y(X): pass
+class Z(X): pass
+
+a: Union[Type[Y], Type[Z]]
+if issubclass(a, X):
+    reveal_type(a)  # E: Revealed type is 'Union[Type[__main__.Y], Type[__main__.Z]]'
+else:
+    reveal_type(a)  # unreachable block
+
+[builtins fixtures/isinstancelist.pyi]
+
+
 [case testIssubclass]
-from typing import Type, ClassVar
+from typing import Type
 
 class Goblin:
     level: int
@@ -1435,19 +1455,8 @@ class GoblinAmbusher(Goblin):
 def test_issubclass(cls: Type[Goblin]) -> None:
     if issubclass(cls, GoblinAmbusher):
         reveal_type(cls)  # E: Revealed type is 'Type[__main__.GoblinAmbusher]'
-        cls.level
-        cls.job
-        ga = cls()
-        ga.level = 15
-        ga.job
-        ga.job = "Warrior"  # E: Cannot assign to class variable "job" via instance
     else:
         reveal_type(cls)  # E: Revealed type is 'Type[__main__.Goblin]'
-        cls.level
-        cls.job  # E: Type[Goblin] has no attribute "job"
-        g = cls()
-        g.level = 15
-        g.job  # E: "Goblin" has no attribute "job"
 
 
 [builtins fixtures/isinstancelist.pyi]
@@ -1482,7 +1491,7 @@ def test_issubclass(cls: Type[Mob]) -> None:
 
 
 [case testIssubclassTuple]
-from typing import Type, ClassVar
+from typing import Type
 
 class Mob:
     pass
