Update mypy/checker.py

Co-authored-by: Stanislav Terliakov <50529348+sterliakov@users.noreply.github.com>
python · randolf-scholz · Jul 15, 2025 · Jul 16, 2025 · Jul 17, 2025 · Jul 17, 2025
commit e80d6587b7768f76e2ebf985085196fdf4b73fce
diff --git a/mypy/checker.py b/mypy/checker.py
@@ -8022,14 +8022,16 @@ def conditional_types(
             return proposed_type, default
         elif not any(
             type_range.is_upper_bound for type_range in proposed_type_ranges
-        ) and (  # concrete subtypes
+        ) and (
+            # concrete subtypes
             is_proper_subtype(current_type, proposed_type, ignore_promotions=True)
-            or (  # structural subtypes
-                is_subtype(current_type, proposed_type, ignore_promotions=True)
-                and (
+            # structural subtypes
+            or (
+                (
                     isinstance(proposed_type, CallableType)
                     or (isinstance(proposed_type, Instance) and proposed_type.type.is_protocol)
                 )
+                and is_subtype(current_type, proposed_type, ignore_promotions=True)
             )
         ):
             # Expression is always of one of the types in proposed_type_ranges