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

Respect abc decorators when classifying function types (#5315)

Browse source 
Closes #5307.
This commit is contained in:
Charlie Marsh 2023-06-22 15:52:36 -04:00 • committed by GitHub
parent 5f88ff8a96
commit cdbd0bd5cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 55 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,10 +35,12 @@ pub fn classify(
semantic
.resolve_call_path(map_callable(&decorator.expression))
.map_or(false, |call_path| {
matches!(call_path.as_slice(), ["", "staticmethod"])
|| staticmethod_decorators
.iter()
.any(|decorator| call_path == from_qualified_name(decorator))
matches!(
call_path.as_slice(),
["", "staticmethod"] | ["abc", "abstractstaticmethod"]
) || staticmethod_decorators
.iter()
.any(|decorator| call_path == from_qualified_name(decorator))
})
}) {
FunctionType::StaticMethod
@ -55,7 +57,7 @@ pub fn classify(
|| decorator_list.iter().any(|decorator| {
// The method is decorated with a class method decorator (like `@classmethod`).
semantic.resolve_call_path(map_callable(&decorator.expression)).map_or(false, |call_path| {
matches!(call_path.as_slice(), ["", "classmethod"]) ||
matches!(call_path.as_slice(), ["", "classmethod"] | ["abc", "abstractclassmethod"]) ||
classmethod_decorators
.iter()
.any(|decorator| call_path == from_qualified_name(decorator))