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

Use colon rather than dot formatting for integer-only types #12534

Merged
merged 1 commit into from
Jul 26, 2024
Merged

Use colon rather than dot formatting for integer-only types #12534

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
10 changes: 10 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 @@ -129,3 +129,13 @@
# Not a valid type annotation but this test shouldn't result in a panic.
# Refer: https://github.com/astral-sh/ruff/issues/11736
x: "'%s + %s' % (1, 2)"

# See: https://github.com/astral-sh/ruff/issues/12421
print("%.2X" % 1)
print("%.02X" % 1)
print("%02X" % 1)
print("%.00002X" % 1)
print("%.20X" % 1)

print("%2X" % 1)
print("%02X" % 1)
15 changes: 13 additions & 2 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 @@ -150,8 +150,19 @@ fn handle_part(part: &CFormatPart<String>) -> Cow<'_, str> {
match precision {
CFormatPrecision::Quantity(quantity) => match quantity {
CFormatQuantity::Amount(amount) => {
format_string.push('.');
format_string.push_str(&amount.to_string());
// Integer-only presentation types.
//
// See: https://docs.python.org/3/library/string.html#format-specification-mini-language
if matches!(
spec.format_char,
'b' | 'c' | 'd' | 'o' | 'x' | 'X' | 'n'
) {
format_string.push('0');
format_string.push_str(&amount.to_string());
} else {
format_string.push('.');
format_string.push_str(&amount.to_string());
}
}
CFormatQuantity::FromValuesTuple => {
unreachable!("Width should be a usize")
Expand Down
141 changes: 141 additions & 0 deletions ...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 @@ -1007,6 +1007,8 @@ UP031_0.py:131:5: UP031 [*] Use format specifiers instead of percent format
130 | # Refer: https://github.com/astral-sh/ruff/issues/11736
131 | x: "'%s + %s' % (1, 2)"
| ^^^^^^^^^^^^^^^^^^ UP031
132 |
133 | # See: https://github.com/astral-sh/ruff/issues/12421
|
= help: Replace with format specifiers

Expand All @@ -1016,3 +1018,142 @@ UP031_0.py:131:5: UP031 [*] Use format specifiers instead of percent format
130 130 | # Refer: https://github.com/astral-sh/ruff/issues/11736
131 |-x: "'%s + %s' % (1, 2)"
131 |+x: "'{} + {}'.format(1, 2)"
132 132 |
133 133 | # See: https://github.com/astral-sh/ruff/issues/12421
134 134 | print("%.2X" % 1)

UP031_0.py:134:7: UP031 [*] Use format specifiers instead of percent format
|
133 | # See: https://github.com/astral-sh/ruff/issues/12421
134 | print("%.2X" % 1)
| ^^^^^^^^^^ UP031
135 | print("%.02X" % 1)
136 | print("%02X" % 1)
|
= help: Replace with format specifiers

ℹ Unsafe fix
131 131 | x: "'%s + %s' % (1, 2)"
132 132 |
133 133 | # See: https://github.com/astral-sh/ruff/issues/12421
134 |-print("%.2X" % 1)
134 |+print("{:02X}".format(1))
135 135 | print("%.02X" % 1)
136 136 | print("%02X" % 1)
137 137 | print("%.00002X" % 1)

UP031_0.py:135:7: UP031 [*] Use format specifiers instead of percent format
|
133 | # See: https://github.com/astral-sh/ruff/issues/12421
134 | print("%.2X" % 1)
135 | print("%.02X" % 1)
| ^^^^^^^^^^^ UP031
136 | print("%02X" % 1)
137 | print("%.00002X" % 1)
|
= help: Replace with format specifiers

ℹ Unsafe fix
132 132 |
133 133 | # See: https://github.com/astral-sh/ruff/issues/12421
134 134 | print("%.2X" % 1)
135 |-print("%.02X" % 1)
135 |+print("{:02X}".format(1))
136 136 | print("%02X" % 1)
137 137 | print("%.00002X" % 1)
138 138 | print("%.20X" % 1)

UP031_0.py:136:7: UP031 [*] Use format specifiers instead of percent format
|
134 | print("%.2X" % 1)
135 | print("%.02X" % 1)
136 | print("%02X" % 1)
| ^^^^^^^^^^ UP031
137 | print("%.00002X" % 1)
138 | print("%.20X" % 1)
|
= help: Replace with format specifiers

ℹ Unsafe fix
133 133 | # See: https://github.com/astral-sh/ruff/issues/12421
134 134 | print("%.2X" % 1)
135 135 | print("%.02X" % 1)
136 |-print("%02X" % 1)
136 |+print("{:02X}".format(1))
137 137 | print("%.00002X" % 1)
138 138 | print("%.20X" % 1)
139 139 |

UP031_0.py:137:7: UP031 [*] Use format specifiers instead of percent format
|
135 | print("%.02X" % 1)
136 | print("%02X" % 1)
137 | print("%.00002X" % 1)
| ^^^^^^^^^^^^^^ UP031
138 | print("%.20X" % 1)
|
= help: Replace with format specifiers

ℹ Unsafe fix
134 134 | print("%.2X" % 1)
135 135 | print("%.02X" % 1)
136 136 | print("%02X" % 1)
137 |-print("%.00002X" % 1)
137 |+print("{:02X}".format(1))
138 138 | print("%.20X" % 1)
139 139 |
140 140 | print("%2X" % 1)

UP031_0.py:138:7: UP031 [*] Use format specifiers instead of percent format
|
136 | print("%02X" % 1)
137 | print("%.00002X" % 1)
138 | print("%.20X" % 1)
| ^^^^^^^^^^^ UP031
139 |
140 | print("%2X" % 1)
|
= help: Replace with format specifiers

ℹ Unsafe fix
135 135 | print("%.02X" % 1)
136 136 | print("%02X" % 1)
137 137 | print("%.00002X" % 1)
138 |-print("%.20X" % 1)
138 |+print("{:020X}".format(1))
139 139 |
140 140 | print("%2X" % 1)
141 141 | print("%02X" % 1)

UP031_0.py:140:7: UP031 [*] Use format specifiers instead of percent format
|
138 | print("%.20X" % 1)
139 |
140 | print("%2X" % 1)
| ^^^^^^^^^ UP031
141 | print("%02X" % 1)
|
= help: Replace with format specifiers

ℹ Unsafe fix
137 137 | print("%.00002X" % 1)
138 138 | print("%.20X" % 1)
139 139 |
140 |-print("%2X" % 1)
140 |+print("{:2X}".format(1))
141 141 | print("%02X" % 1)

UP031_0.py:141:7: UP031 [*] Use format specifiers instead of percent format
|
140 | print("%2X" % 1)
141 | print("%02X" % 1)
| ^^^^^^^^^^ UP031
|
= help: Replace with format specifiers

ℹ Unsafe fix
138 138 | print("%.20X" % 1)
139 139 |
140 140 | print("%2X" % 1)
141 |-print("%02X" % 1)
141 |+print("{:02X}".format(1))
Loading