Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pyupgrade] Implement import-replacement rule (UP035) #2049

Merged
merged 50 commits into from
Jan 31, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
cf9155f
Basic groundwork laid
colin99d Jan 20, 2023
6b5c4aa
Going to WIPE libcst
colin99d Jan 21, 2023
04ac882
Fixed conversion
colin99d Jan 21, 2023
9ac1642
Need to switch
colin99d Jan 21, 2023
34b28fc
Merged
colin99d Jan 21, 2023
ac38462
Better indentation tests
colin99d Jan 21, 2023
1c1d391
Fixed second from indentation issue
colin99d Jan 21, 2023
7035102
Fixed fmt and nightly
colin99d Jan 21, 2023
51f6d5c
Added a bunch more things to replace
colin99d Jan 21, 2023
1980519
Added some fixes
colin99d Jan 21, 2023
1fbd14c
Fixed a bug in formatting
colin99d Jan 21, 2023
b7016fa
Fixed formatting error
colin99d Jan 21, 2023
0448418
Fixed formatting errors
colin99d Jan 21, 2023
3bf08dd
Got base tests going
colin99d Jan 21, 2023
b0d2456
Got the mods in
colin99d Jan 21, 2023
860a1d1
Finished up a rough draft, still has the libcst bug
colin99d Jan 21, 2023
4a8263a
Fixed some formatting
colin99d Jan 21, 2023
08c2174
Fixed clippy
colin99d Jan 21, 2023
8e98545
Merge branch 'main' into ImportReplacements
colin99d Jan 22, 2023
6b4d68a
STARTED TRANSITION FROM LIBCST TO CUSTOM
colin99d Jan 22, 2023
30a7180
An MVP with no known bugs
colin99d Jan 22, 2023
f811a84
Added more tests for six.moves
colin99d Jan 22, 2023
b326a29
Handled one last issue
colin99d Jan 22, 2023
af1af04
Fixed some more stuff
colin99d Jan 22, 2023
e8a55a7
Added some fixes
colin99d Jan 22, 2023
679a134
Fixed clippy
colin99d Jan 22, 2023
fd8f418
Deleted unused snapshots
colin99d Jan 22, 2023
ac95e2c
Fixed typos
colin99d Jan 22, 2023
e9bd812
Fixed typos
colin99d Jan 22, 2023
943585c
Added some tests
colin99d Jan 23, 2023
42ae4c5
Fixed tests
colin99d Jan 23, 2023
50c85ac
Merge branch 'main' into ImportReplacements
colin99d Jan 26, 2023
04cd251
Recommended changes
colin99d Jan 26, 2023
65cc26a
Merge branch 'main' into ImportReplacements
colin99d Jan 27, 2023
9d67f07
Merge branch 'main' into ImportReplacements
charliermarsh Jan 29, 2023
603c10b
Rewrite parts of the check
charliermarsh Jan 30, 2023
f7cbd58
Removed six stuff
colin99d Jan 30, 2023
880ebca
Merge branch 'ImportReplacements' of https://github.com/colin99d/ruff…
colin99d Jan 30, 2023
91c38b6
Merge branch 'main' into ImportReplacements
colin99d Jan 30, 2023
0c0a098
removed six
colin99d Jan 30, 2023
3d820f0
Merge branch 'ImportReplacements' of https://github.com/colin99d/ruff…
colin99d Jan 30, 2023
fd53580
Merge branch 'main' into ImportReplacements
charliermarsh Jan 30, 2023
c071895
Merge branch 'charlie/import-replacements' into ImportReplacements
charliermarsh Jan 30, 2023
ef4d532
Small refactors; add one failing test
charliermarsh Jan 30, 2023
2af94db
Avoid bad multi-line fix
charliermarsh Jan 30, 2023
cd7ea96
Merge branch 'main' into ImportReplacements
charliermarsh Jan 30, 2023
1cb84fc
Always flag
charliermarsh Jan 30, 2023
53d6b1f
Flag multi
charliermarsh Jan 30, 2023
dad535f
Use pyupgrade-like token based removal
charliermarsh Jan 30, 2023
f17c2ff
Merge branch 'main' into ImportReplacements
charliermarsh Jan 30, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added some fixes
  • Loading branch information
colin99d committed Jan 22, 2023
commit e8a55a7755ed8d3eba543a9155376b70b4cac780
2 changes: 1 addition & 1 deletion src/rules/pyupgrade/rules/import_replacements.rs
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ pub fn import_replacements(
let module_text = checker
.locator
.slice_source_code_range(&Range::from_located(stmt));
let formatting = ImportFormatting::new(checker.locator, stmt, &names);
let formatting = ImportFormatting::new(checker.locator, stmt, names);
let fixer = FixImports::new(
clean_mod,
formatting.multi_line,
Expand Down
16 changes: 8 additions & 8 deletions src/rules/pyupgrade/rules/import_replacements_six.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ fn refactor_segment(
clean_names.push(name.node.clone());
}

let formatting = ImportFormatting::new(locator, stmt, &names);
let formatting = ImportFormatting::new(locator, stmt, names);
for name in names {
let import_name = name.node.name.as_str();
match replace.get(import_name) {
None => keep_names.push(name.node.clone()),
Some(item) => {
// Only replace if the name remains the name, or if there is an as on the import
let new_name = item.split(".").last().unwrap_or_default();
let new_name = item.split('.').last().unwrap_or_default();
if name.node.asname.is_some() || import_name == new_name {
new_entries.push_str(&format!("{}import {item}", formatting.start_indent));
if let Some(final_name) = &name.node.asname {
Expand Down Expand Up @@ -134,7 +134,7 @@ fn replace_from_only(
if let Some(item) = replace.get(new_moudle_text.as_str()) {
let original = locator.slice_source_code_range(&Range::from_located(stmt));
let new_str = original.replace(module, item);
return Some(new_str.to_string());
return Some(new_str);
}
None
}
Expand All @@ -144,34 +144,34 @@ pub fn import_replacements_six(
checker: &mut Checker,
stmt: &Stmt,
module: &Option<String>,
names: &Vec<Located<AliasData>>,
names: &[Located<AliasData>],
) {
// Pyupgrade only works with import_from statements, so this linter does that as
// well
let final_string: Option<String>;
if let Some(module_text) = module {
if module_text == "six.moves" {
final_string =
refactor_segment(checker.locator, stmt, &REPLACE_MODS, &names, module_text);
refactor_segment(checker.locator, stmt, &REPLACE_MODS, names, module_text);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pass checker.stylist here (charliermarsh prefers just after locator)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mind clarifying what you mean here. I interpret it as you want me to use checker.stylist.locator, but the locator member of Stylist is private. So I am assuming you mean something else.

} else if module_text == "six.moves.urllib" {
final_string = refactor_segment(
checker.locator,
stmt,
&REPLACE_MODS_URLLIB,
&names,
names,
module_text,
);
} else if module_text.contains("six.moves.urllib") {
final_string = replace_from_only(
&module_text,
module_text,
checker.locator,
stmt,
&REPLACE_MODS_URLLIB,
"six.moves.urllib",
);
} else if module_text.contains("six.moves") {
final_string = replace_from_only(
&module_text,
module_text,
checker.locator,
stmt,
&REPLACE_MODS,
Expand Down