Respect subscripted base classes in type-checking rules (#7954)

Closes #7945.
astral-sh · Oct 13, 2023 · bd06cbe · bd06cbe
1 parent ddffadb
commit bd06cbe
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/...f_linter/resources/test/fixtures/flake8_type_checking/runtime_evaluated_base_classes_3.py b/...f_linter/resources/test/fixtures/flake8_type_checking/runtime_evaluated_base_classes_3.py
@@ -22,3 +22,10 @@ class C:
 
 class D(C):
     x: UUID
+
+
+import collections
+
+
+class E(BaseModel[int]):
+    x: collections.Awaitable
diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/helpers.rs b/crates/ruff_linter/src/rules/flake8_type_checking/helpers.rs
@@ -1,5 +1,5 @@
 use ruff_python_ast::call_path::from_qualified_name;
-use ruff_python_ast::helpers::map_callable;
+use ruff_python_ast::helpers::{map_callable, map_subscript};
 use ruff_python_semantic::{Binding, BindingKind, ScopeKind, SemanticModel};
 
 pub(crate) fn is_valid_runtime_import(binding: &Binding, semantic: &SemanticModel) -> bool {
@@ -40,11 +40,13 @@ fn runtime_evaluated_base_class(base_classes: &[String], semantic: &SemanticMode
     };
 
     class_def.bases().iter().any(|base| {
-        semantic.resolve_call_path(base).is_some_and(|call_path| {
-            base_classes
-                .iter()
-                .any(|base_class| from_qualified_name(base_class) == call_path)
-        })
+        semantic
+            .resolve_call_path(map_subscript(base))
+            .is_some_and(|call_path| {
+                base_classes
+                    .iter()
+                    .any(|base_class| from_qualified_name(base_class) == call_path)
+            })
     })
 }