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

Skip trivia when searching for named exception (#6218) 

Closes https://github.com/astral-sh/ruff/issues/6213.
This commit is contained in:
Charlie Marsh 2023-07-31 23:42:30 -04:00 committed by GitHub
parent 38b5726948
commit ff9ebbaa5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/ruff/resources/test/fixtures/pyflakes/F841_3.py vendored
View File

@ -147,3 +147,10 @@ def f() -> None:
global CONSTANT global CONSTANT
CONSTANT = 1 CONSTANT = 1
CONSTANT = 2 CONSTANT = 2
def f() -> None:
try:
print("hello")
except A as e :
print("oh no!")

1
crates/ruff/src/rules/pyflakes/fixes.rs
View File

@ -115,6 +115,7 @@ pub(crate) fn remove_exception_handler_assignment(
// Lex forwards, to the `:` token. // Lex forwards, to the `:` token.
let following = SimpleTokenizer::starts_at(bound_exception.range.end(), locator.contents()) let following = SimpleTokenizer::starts_at(bound_exception.range.end(), locator.contents())
.skip_trivia()
.next() .next()
.context("expected the exception name to be followed by a colon")?; .context("expected the exception name to be followed by a colon")?;
debug_assert!(matches!(following.kind, SimpleTokenKind::Colon)); debug_assert!(matches!(following.kind, SimpleTokenKind::Colon));

18
crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F841_F841_3.py.snap
View File

@ -584,4 +584,22 @@ F841_3.py:139:17: F841 Local variable `x` is assigned to but never used
| |
= help: Remove assignment to unused variable `x` = help: Remove assignment to unused variable `x`
F841_3.py:155:17: F841 [*] Local variable `e` is assigned to but never used
|
153 | try:
154 | print("hello")
155 | except A as e :
| ^ F841
156 | print("oh no!")
|
= help: Remove assignment to unused variable `e`
ℹ Fix
152 152 | def f() -> None:
153 153 | try:
154 154 | print("hello")
155 |- except A as e :
155 |+ except A:
156 156 | print("oh no!")