Narrow callable checks to Never

Author: A5rocks

mypy/checker.py

@@ -5881,15 +5881,11 @@ def conditional_callable_type_map(
 
         callables, uncallables = self.partition_by_callable(current_type, unsound_partition=False)
 
-        if callables and uncallables:
-            callable_map = {expr: UnionType.make_union(callables)} if callables else None
-            uncallable_map = {expr: UnionType.make_union(uncallables)} if uncallables else None
-            return callable_map, uncallable_map
-
-        elif callables:
-            return {}, None
-
-        return None, {}
+        callable_map = {expr: UnionType.make_union(callables) if callables else UninhabitedType()}
+        uncallable_map = {
+            expr: UnionType.make_union(uncallables) if uncallables else UninhabitedType()
+        }
+        return callable_map, uncallable_map
 
     def conditional_types_for_iterable(
         self, item_type: Type, iterable_type: Type

test-data/unit/check-callable.test

@@ -514,7 +514,7 @@ if callable():  # E: Missing positional argument "x" in call to "callable"
 fn = None
 if callable(fn):
     _ = "unreachable"  # E: Statement is unreachable
-    fn()  # E: "None" not callable
+    fn()
 
 [builtins fixtures/callable.pyi]