mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-15 16:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Improve handling of metaclasses in various linter rules (#12579)

Browse source
This commit is contained in:
Alex Waygood 2024-07-30 14:48:36 +01:00 • committed by GitHub
parent ac1666d6e2
commit 7a4419a2a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 46 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ruff_python_semantic/src/analyze/class.rs
View file

@ -110,3 +110,13 @@ pub fn is_enumeration(class_def: &ast::StmtClassDef, semantic: &SemanticModel) -
)
})
}
/// Returns `true` if the given class is a metaclass.
pub fn is_metaclass(class_def: &ast::StmtClassDef, semantic: &SemanticModel) -> bool {
any_qualified_name(class_def, semantic, &|qualified_name| {
matches!(
qualified_name.segments(),
["" | "builtins", "type"] | ["abc", "ABCMeta"] | ["enum", "EnumMeta" | "EnumType"]
)
})
}

17
crates/ruff_python_semantic/src/analyze/function_type.rs
View file

@ -3,7 +3,7 @@ use ruff_python_ast::name::{QualifiedName, UnqualifiedName};
use ruff_python_ast::{Decorator, Expr, Stmt, StmtExpr, StmtFunctionDef, StmtRaise};
use crate::model::SemanticModel;
use crate::scope::{Scope, ScopeKind};
use crate::scope::Scope;
#[derive(Debug, Copy, Clone)]
pub enum FunctionType {
@ -17,12 +17,12 @@ pub enum FunctionType {
pub fn classify(
name: &str,
decorator_list: &[Decorator],
scope: &Scope,
parent_scope: &Scope,
semantic: &SemanticModel,
classmethod_decorators: &[String],
staticmethod_decorators: &[String],
) -> FunctionType {
let ScopeKind::Class(class_def) = &scope.kind else {
if !parent_scope.kind.is_class() {
return FunctionType::Function;
};
if decorator_list
@ -30,16 +30,7 @@ pub fn classify(
.any(|decorator| is_static_method(decorator, semantic, staticmethod_decorators))
{
FunctionType::StaticMethod
} else if matches!(name, "__new__" | "__init_subclass__" | "__class_getitem__")
// Special-case class method, like `__new__`.
|| class_def.bases().iter().any(|expr| {
// The class itself extends a known metaclass, so all methods are class methods.
semantic
.resolve_qualified_name(map_callable(expr))
.is_some_and( |qualified_name| {
matches!(qualified_name.segments(), ["" | "builtins", "type"] | ["abc", "ABCMeta"])
})
})
} else if matches!(name, "__new__" | "__init_subclass__" | "__class_getitem__") // Special-case class method, like `__new__`.
|| decorator_list.iter().any(|decorator| is_class_method(decorator, semantic, classmethod_decorators))
{
FunctionType::ClassMethod