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.

Sign up for GitHub

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

Jump to bottom

Enable printf-string-formatting fix with comments on right-hand side #9037

Merged
merged 1 commit into from
Dec 7, 2023
+44 −13
Merged

Enable printf-string-formatting fix with comments on right-hand side #9037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions crates/ruff_linter/resources/test/fixtures/pyupgrade/UP031_0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,10 @@
"%s" % (
x, # comment
)


path = "%s-%s-%s.pem" % (
safe_domain_name(cn), # common name, which should be filename safe because it is IDNA-encoded, but in case of a malformed cert make sure it's ok to use as a filename
cert.not_valid_after.date().isoformat().replace("-", ""), # expiration date
hexlify(cert.fingerprint(hashes.SHA256())).decode("ascii")[0:8], # fingerprint prefix
)
16 changes: 4 additions & 12 deletions crates/ruff_linter/src/rules/pyupgrade/rules/printf_string_formatting.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,18 +490,10 @@ pub(crate) fn printf_string_formatting(checker: &mut Checker, expr: &Expr, right
contents.push_str(&format!(".format{params_string}"));

let mut diagnostic = Diagnostic::new(PrintfStringFormatting, expr.range());
// Avoid fix if there are comments within the right-hand side:
// ```
// "%s" % (
// 0, # 0
// )
// ```
if !checker.indexer().comment_ranges().intersects(right.range()) {
diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
contents,
expr.range(),
)));
}
diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
contents,
expr.range(),
)));
checker.diagnostics.push(diagnostic);
}

Expand Down
34 changes: 33 additions & 1 deletion ...inter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP031_0.py.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ UP031_0.py:104:5: UP031 [*] Use format specifiers instead of percent format
109 108 |
110 109 | "%s" % (

UP031_0.py:110:1: UP031 Use format specifiers instead of percent format
UP031_0.py:110:1: UP031 [*] Use format specifiers instead of percent format
|
108 | )
109 |
Expand All @@ -907,4 +907,36 @@ UP031_0.py:110:1: UP031 Use format specifiers instead of percent format
|
= help: Replace with format specifiers

ℹ Unsafe fix
107 107 | % (x,)
108 108 | )
109 109 |
110 |-"%s" % (
110 |+"{}".format(
111 111 | x, # comment
112 112 | )
113 113 |

UP031_0.py:115:8: UP031 [*] Use format specifiers instead of percent format
|
115 | path = "%s-%s-%s.pem" % (
| ________^
116 | | safe_domain_name(cn), # common name, which should be filename safe because it is IDNA-encoded, but in case of a malformed cert make sure it's ok to use as a filename
117 | | cert.not_valid_after.date().isoformat().replace("-", ""), # expiration date
118 | | hexlify(cert.fingerprint(hashes.SHA256())).decode("ascii")[0:8], # fingerprint prefix
119 | | )
| |_^ UP031
|
= help: Replace with format specifiers

ℹ Unsafe fix
112 112 | )
113 113 |
114 114 |
115 |-path = "%s-%s-%s.pem" % (
115 |+path = "{}-{}-{}.pem".format(
116 116 | safe_domain_name(cn), # common name, which should be filename safe because it is IDNA-encoded, but in case of a malformed cert make sure it's ok to use as a filename
117 117 | cert.not_valid_after.date().isoformat().replace("-", ""), # expiration date
118 118 | hexlify(cert.fingerprint(hashes.SHA256())).decode("ascii")[0:8], # fingerprint prefix


Loading