Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[`flake8-use-pathlib`] A bit clean up `PTH100` (#20452) 

## Summary

Part of https://github.com/astral-sh/ruff/pull/20215

## Test Plan
This commit is contained in:
chiri 2025-09-17 19:11:30 +03:00 committed by GitHub
parent c585c9f6d4
commit cb3c3ba94d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_abspath.rs
View File

@ -1,13 +1,11 @@
use ruff_diagnostics::{Edit, Fix}; use ruff_diagnostics::Applicability;
use ruff_macros::{ViolationMetadata, derive_message_formats}; use ruff_macros::{ViolationMetadata, derive_message_formats};
use ruff_python_ast::ExprCall; use ruff_python_ast::ExprCall;
use ruff_text_size::Ranged;
use crate::checkers::ast::Checker; use crate::checkers::ast::Checker;
use crate::importer::ImportRequest;
use crate::preview::is_fix_os_path_abspath_enabled; use crate::preview::is_fix_os_path_abspath_enabled;
use crate::rules::flake8_use_pathlib::helpers::{ use crate::rules::flake8_use_pathlib::helpers::{
has_unknown_keywords_or_starred_expr, is_pathlib_path_call, check_os_pathlib_single_arg_calls, has_unknown_keywords_or_starred_expr,
}; };
use crate::{FixAvailability, Violation}; use crate::{FixAvailability, Violation};
@ -75,43 +73,17 @@ pub(crate) fn os_path_abspath(checker: &Checker, call: &ExprCall, segments: &[&s
return; return;
} }
if call.arguments.len() != 1 {
return;
}
let Some(arg) = call.arguments.find_argument_value("path", 0) else {
return;
};
let arg_code = checker.locator().slice(arg.range());
let range = call.range();
let mut diagnostic = checker.report_diagnostic(OsPathAbspath, call.func.range());
if has_unknown_keywords_or_starred_expr(&call.arguments, &["path"]) { if has_unknown_keywords_or_starred_expr(&call.arguments, &["path"]) {
return; return;
} }
if !is_fix_os_path_abspath_enabled(checker.settings()) { check_os_pathlib_single_arg_calls(
return; checker,
} call,
"resolve()",
diagnostic.try_set_fix(|| { "path",
let (import_edit, binding) = checker.importer().get_or_import_symbol( is_fix_os_path_abspath_enabled(checker.settings()),
&ImportRequest::import("pathlib", "Path"), OsPathAbspath,
call.start(), Some(Applicability::Unsafe),
checker.semantic(), );
)?;
let replacement = if is_pathlib_path_call(checker, arg) {
format!("{arg_code}.resolve()")
} else {
format!("{binding}({arg_code}).resolve()")
};
Ok(Fix::unsafe_edits(
Edit::range_replacement(replacement, range),
[import_edit],
))
});
} }