mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-30 22:01:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Allow TID252 to fix all valid module paths (#3796)

Browse source
This commit is contained in:
Jonathan Plasse 2023-03-29 21:13:12 +02:00 • committed by GitHub
parent 9d3b8eb67b
commit cb588d1d6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/ruff/resources/test/fixtures/flake8_tidy_imports/TID252/my_package/sublib/api/application.py vendored
View file

@ -7,3 +7,4 @@ from ..protocol import commands, definitions, responses
from ..server import example
from .. import server
from . import logger, models
from ..protocol.UpperCaseModule import some_function

2
crates/ruff/resources/test/fixtures/flake8_tidy_imports/TID252/my_package/sublib/protocol/UpperCaseModule.py vendored Normal file
View file

@ -0,0 +1,2 @@
def some_function():
pass

24
crates/ruff/src/rules/flake8_tidy_imports/relative_imports.rs
View file

@ -7,7 +7,8 @@ use ruff_macros::{derive_message_formats, violation, CacheKey};
use ruff_python_ast::helpers::{create_stmt, from_relative_import, unparse_stmt};
use ruff_python_ast::source_code::Stylist;
use ruff_python_ast::types::Range;
use ruff_python_stdlib::identifiers::is_module_name;
use ruff_python_stdlib::identifiers::is_identifier;
use ruff_python_stdlib::keyword::KWLIST;
use crate::checkers::ast::Checker;
use crate::registry::AsRule;
@ -106,25 +107,34 @@ fn fix_banned_relative_import(
let module_name = if let Some(module) = module {
let call_path = from_relative_import(&parts, module);
// Require import to be a valid PEP 8 module:
// Require import to be a valid module:
// https://python.org/dev/peps/pep-0008/#package-and-module-names
if !call_path.iter().all(|part| is_module_name(part)) {
if !call_path
.iter()
.all(|part| is_identifier(part) && !KWLIST.contains(part))
{
return None;
}
call_path.as_slice().join(".")
} else if parts.len() > 1 {
let module = parts.pop().unwrap();
let call_path = from_relative_import(&parts, &module);
// Require import to be a valid PEP 8 module:
// Require import to be a valid module:
// https://python.org/dev/peps/pep-0008/#package-and-module-names
if !call_path.iter().all(|part| is_module_name(part)) {
if !call_path
.iter()
.all(|part| is_identifier(part) && !KWLIST.contains(part))
{
return None;
}
call_path.as_slice().join(".")
} else {
// Require import to be a valid PEP 8 module:
// Require import to be a valid module:
// https://python.org/dev/peps/pep-0008/#package-and-module-names
if !parts.iter().all(|part| is_module_name(part)) {
if !parts
.iter()
.all(|part| is_identifier(part) && !KWLIST.contains(&part.as_str()))
{
return None;
}
parts.join(".")

21
crates/ruff/src/rules/flake8_tidy_imports/snapshots/ruff__rules__flake8_tidy_imports__relative_imports__tests__ban_parent_imports_package.snap
View file

@ -121,4 +121,25 @@ expression: diagnostics
row: 8
column: 21
parent: ~
- kind:
name: RelativeImports
body: Relative imports from parent modules are banned
suggestion: Replace relative imports from parent modules with absolute imports
fixable: true
location:
row: 10
column: 0
end_location:
row: 10
column: 52
fix:
edits:
- content: from my_package.sublib.protocol.UpperCaseModule import some_function
location:
row: 10
column: 0
end_location:
row: 10
column: 52
parent: ~