diff --git a/crates/ruff/resources/test/fixtures/flake8_logging_format/G010.py b/crates/ruff/resources/test/fixtures/flake8_logging_format/G010.py index 9b39f595a5..8d16e5e050 100644 --- a/crates/ruff/resources/test/fixtures/flake8_logging_format/G010.py +++ b/crates/ruff/resources/test/fixtures/flake8_logging_format/G010.py @@ -1,3 +1,5 @@ import logging +from distutils import log logging.warn("Hello World!") +log.warn("Hello world!") # This shouldn't be considered as a logger candidate diff --git a/crates/ruff/src/rules/flake8_logging_format/snapshots/ruff__rules__flake8_logging_format__tests__G010.py.snap b/crates/ruff/src/rules/flake8_logging_format/snapshots/ruff__rules__flake8_logging_format__tests__G010.py.snap index d32b8cd648..3db67aafb9 100644 --- a/crates/ruff/src/rules/flake8_logging_format/snapshots/ruff__rules__flake8_logging_format__tests__G010.py.snap +++ b/crates/ruff/src/rules/flake8_logging_format/snapshots/ruff__rules__flake8_logging_format__tests__G010.py.snap @@ -8,19 +8,19 @@ expression: diagnostics suggestion: "Convert to `warn`" fixable: true location: - row: 3 + row: 4 column: 8 end_location: - row: 3 + row: 4 column: 12 fix: edits: - content: warning location: - row: 3 + row: 4 column: 8 end_location: - row: 3 + row: 4 column: 12 parent: ~ diff --git a/crates/ruff_python_semantic/src/analyze/logging.rs b/crates/ruff_python_semantic/src/analyze/logging.rs index 4dcdf41c29..95851055c7 100644 --- a/crates/ruff_python_semantic/src/analyze/logging.rs +++ b/crates/ruff_python_semantic/src/analyze/logging.rs @@ -18,9 +18,15 @@ use crate::context::Context; /// ``` pub fn is_logger_candidate(context: &Context, func: &Expr) -> bool { if let ExprKind::Attribute { value, .. } = &func.node { - let Some(call_path) = context - .resolve_call_path(value) - .or_else(|| collect_call_path(value)) else { + let Some(call_path) = (if let Some(call_path) = context.resolve_call_path(value) { + if call_path.first().map_or(false, |module| *module == "logging") { + Some(call_path) + } else { + None + } + } else { + collect_call_path(value) + }) else { return false; }; if let Some(tail) = call_path.last() {