Skip to content

[flake8-simplify] Suppress SIM105 for except* before Python 3.12 - #23869

Merged
charliermarsh merged 5 commits into
astral-sh:mainfrom
getehen:fix/SIM105-disabled-py311
Mar 27, 2026
Merged

[flake8-simplify] Suppress SIM105 for except* before Python 3.12#23869
charliermarsh merged 5 commits into
astral-sh:mainfrom
getehen:fix/SIM105-disabled-py311

Conversation

@getehen

@getehen getehen commented Mar 10, 2026

Copy link
Copy Markdown
Contributor

Hi,

Fix 23798 : SIM105 should not be active before py 3.12.

The solution is simple: If the target version is lower or equal than 3.11, the check is passed.
There might be a caveat: I am not sure the target version is always 100% valid ? But it seemed the most accurate thing to use here.

Some tests were added, checking in 3.12 and 3.11 to check that the test suppression happen in 3.11 but not in 3.12.

I can also add a mention in the docs ? If so, should I do this directly here ?

@astral-sh-bot
astral-sh-bot Bot requested a review from ntBre March 10, 2026 14:59
@astral-sh-bot

astral-sh-bot Bot commented Mar 10, 2026 •
edited
Loading

Copy link
Copy Markdown

ruff-ecosystem results

Linter (stable)

✅ ecosystem check detected no linter changes.

Linter (preview)

✅ ecosystem check detected no linter changes.

ntBre
ntBre previously requested changes Mar 10, 2026
View reviewed changes

@ntBre ntBre left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This fix doesn't appear to be correct. I checked the ecosystem report and regular except handlers (with just except) are no longer being flagged. The issue is specific to except* handlers like that shown in the issue:

def raise_group(x):
    raise ExceptionGroup("!", [ValueError(x)])
try:
   raise_group(1)
except* ValueError:  # This needs to be skipped
   pass

try: ...
except ValueError: # This should still emit a diagnostic
    pass

@getehen

getehen commented Mar 11, 2026

Copy link
Copy Markdown
Contributor Author

My bad, I will look into it

@getehen
[ruff] suppress suppressible exception for except*
7395307 
For py311, suppressible-exception should not be raised with except* (in
my previous commit I disabled it with every except, independently of the
*, which is wrong).

New tests accordingly.
ntBre
ntBre reviewed Mar 12, 2026
View reviewed changes

@ntBre ntBre left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thank you! This looks good to me now, I just had one suggestion about testing.

Comment thread crates/ruff_linter/src/rules/flake8_simplify/mod.rs Outdated
Path::new("flake8_simplify").join(path).as_path(),
&settings::LinterSettings::for_rule(rule_code).with_target_version(py_version),
)?;
assert_diagnostics!(snapshot, diagnostics);

@ntBre ntBre Mar 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think this would be a good use of our assert_diagnostics_diff! macro instead of two separate test_cases.

@ntBre ntBre changed the title [flake8-simplify] Make SIM105 invalid for py <= 3.11 [flake8-simplify] Suppress SIM105 for except* before Python 3.12 Mar 12, 2026
@getehen
[ruff] use of assert_diagnostic_diff
e2a4b91 
assert_diagnostic_diff is better than two test cases with a different
version
@getehen

getehen commented Mar 22, 2026

Copy link
Copy Markdown
Contributor Author

Sorry for the delay, it was indeed exactly what assert_diagnostics_diff was made for

@ntBre ntBre mentioned this pull request Mar 23, 2026
Closed
@charliermarsh
charliermarsh enabled auto-merge (squash) March 27, 2026 02:45
@charliermarsh
charliermarsh disabled auto-merge March 27, 2026 02:51
@charliermarsh
charliermarsh requested a review from ntBre March 27, 2026 02:51
@charliermarsh
charliermarsh enabled auto-merge (squash) March 27, 2026 02:51
@charliermarsh
charliermarsh disabled auto-merge March 27, 2026 02:51
@charliermarsh
charliermarsh removed the request for review from ntBre March 27, 2026 02:52
@charliermarsh
charliermarsh enabled auto-merge (squash) March 27, 2026 02:52
@charliermarsh
charliermarsh merged commit 690ef81 into astral-sh:main Mar 27, 2026
42 checks passed
carljm added a commit that referenced this pull request Mar 31, 2026
@carljm
Merge branch 'main' into charlie/metaclass
3bd98a5 
* main: (40 commits)
  [ty] resolve union-likes in emitting union attribute errors (#24263)
  [ty] Improve support for `Callable` type context (#23888)
  [ty] Propagate type context through `await` expressions (#24256)
  [`pyflakes`] Flag annotated variable redeclarations as `F811` in preview mode (#24244)
  [ty] Preserve `Divergent` when materializing recursive aliases (#24245)
  Fix W391 fixes for consecutive empty notebook cells (#24236)
  [flake8-bugbear] Clarify RUF071 fix safety for non-path string comparisons (#24149)
  [ty] Ban type qualifiers in PEP-695 type aliases (#24242)
  [ty] Include keyword-prefixed symbols in completions for attributes (#24232)
  [ty] Add tests for TypedDict method overloads on unions (#24230)
  [ty] report unused bindings as unnecessary hint diagnostics (#23305)
  Remove unused `non_root` variable (#24238)
  Extend F507 to flag %-format strings with zero placeholders (#24215)
  [`flake8-simplify`] Suppress `SIM105` for `except*` before Python 3.12 (#23869)
  Ignore pre-initialization references in SIM113 (#24235)
  Parenthesize expression in RUF050 fix (#24234)
  Publish playgrounds using the `release-playground` environment (#24223)
  [ty] Fix instance-attribute lookup in methods of protocol classes (#24213)
  [ty] Used shared expression cache during generic call inference (#24219)
  [ty] make `Type::BoundMethod` include instances of same-named methods bound to a subclass (#24039)
  ...
@BrewTestBot BrewTestBot mentioned this pull request Apr 2, 2026
Merged
nicopauss pushed a commit to Intersec/lib-common that referenced this pull request Jun 4, 2026
@renovate-bot @nicopauss
chore(deps): update dependency ruff to v0.15.10 (2024.6)
a1a28be 
##### [\`v0.15.10\`](https://github.com/astral-sh/ruff/blob/HEAD/CHANGELOG.md#01510)

Released on 2026-04-09.

##### Preview features

- \[`flake8-logging`] Allow closures in except handlers (`LOG004`) ([#24464](astral-sh/ruff#24464))
- \[`flake8-self`] Make `SLF` diagnostics robust to non-self-named variables ([#24281](astral-sh/ruff#24281))
- \[`flake8-simplify`] Make the fix for `collapsible-if` safe in `preview` (`SIM102`) ([#24371](astral-sh/ruff#24371))

##### Bug fixes

- Avoid emitting multi-line f-string elements before Python 3.12 ([#24377](astral-sh/ruff#24377))
- Avoid syntax error from `E502` fixes in f-strings and t-strings ([#24410](astral-sh/ruff#24410))
- Strip form feeds from indent passed to `dedent_to` ([#24381](astral-sh/ruff#24381))
- \[`pyupgrade`] Fix panic caused by handling of octals (`UP012`) ([#24390](astral-sh/ruff#24390))
- Reject multi-line f-string elements before Python 3.12 ([#24355](astral-sh/ruff#24355))

##### Rule changes

- \[`ruff`] Treat f-string interpolation as potential side effect (`RUF019`) ([#24426](astral-sh/ruff#24426))

##### Server

- Add support for custom file extensions ([#24463](astral-sh/ruff#24463))

##### Documentation

- Document adding fixes in CONTRIBUTING.md ([#24393](astral-sh/ruff#24393))
- Fix JSON typo in settings example ([#24517](astral-sh/ruff#24517))

##### Contributors

- [@charliermarsh](https://github.com/charliermarsh)
- [@dylwil3](https://github.com/dylwil3)
- [@silverstein](https://github.com/silverstein)
- [@anishgirianish](https://github.com/anishgirianish)
- [@shizukushq](https://github.com/shizukushq)
- [@zanieb](https://github.com/zanieb)
- [@AlexWaygood](https://github.com/AlexWaygood)
##### [\`v0.15.9\`](https://github.com/astral-sh/ruff/blob/HEAD/CHANGELOG.md#0159)

Released on 2026-04-02.

##### Preview features

- \[`pyflakes`] Flag annotated variable redeclarations as `F811` in preview mode ([#24244](astral-sh/ruff#24244))
- \[`ruff`] Allow dunder-named assignments in non-strict mode for `RUF067` ([#24089](astral-sh/ruff#24089))

##### Bug fixes

- \[`flake8-errmsg`] Avoid shadowing existing `msg` in fix for `EM101` ([#24363](astral-sh/ruff#24363))
- \[`flake8-simplify`] Ignore pre-initialization references in `SIM113` ([#24235](astral-sh/ruff#24235))
- \[`pycodestyle`] Fix `W391` fixes for consecutive empty notebook cells ([#24236](astral-sh/ruff#24236))
- \[`pyupgrade`] Fix `UP008` nested class matching ([#24273](astral-sh/ruff#24273))
- \[`pyupgrade`] Ignore strings with string-only escapes (`UP012`) ([#16058](astral-sh/ruff#16058))
- \[`ruff`] `RUF072`: skip formfeeds on dedent ([#24308](astral-sh/ruff#24308))
- \[`ruff`] Avoid re-using symbol in `RUF024` fix ([#24316](astral-sh/ruff#24316))
- \[`ruff`] Parenthesize expression in `RUF050` fix ([#24234](astral-sh/ruff#24234))
- Disallow starred expressions as values of starred expressions ([#24280](astral-sh/ruff#24280))

##### Rule changes

- \[`flake8-simplify`] Suppress `SIM105` for `except*` before Python 3.12 ([#23869](astral-sh/ruff#23869))
- \[`pyflakes`] Extend `F507` to flag `%`-format strings with zero placeholders ([#24215](astral-sh/ruff#24215))
- \[`pyupgrade`] `UP018` should detect more unnecessarily wrapped literals (UP018) ([#24093](astral-sh/ruff#24093))
- \[`pyupgrade`] Fix `UP008` callable scope handling to support lambdas ([#24274](astral-sh/ruff#24274))
- \[`ruff`] `RUF010`: Mark fix as unsafe when it deletes a comment ([#24270](astral-sh/ruff#24270))

##### Formatter

- Add `nested-string-quote-style` formatting option ([#24312](astral-sh/ruff#24312))

##### Documentation

- \[`flake8-bugbear`] Clarify RUF071 fix safety for non-path string comparisons ([#24149](astral-sh/ruff#24149))
- \[`flake8-type-checking`] Clarify import cycle wording for `TC001`/`TC002`/`TC003` ([#24322](astral-sh/ruff#24322))

##### Other changes

- Avoid rendering fix lines with trailing whitespace after `|` ([#24343](astral-sh/ruff#24343))

##### Contributors

- [@charliermarsh](https://github.com/charliermarsh)
- [@MichaReiser](https://github.com/MichaReiser)
- [@tranhoangtu-it](https://github.com/tranhoangtu-it)
- [@dylwil3](https://github.com/dylwil3)
- [@zsol](https://github.com/zsol)
- [@renovate](https://github.com/renovate)
- [@bitloi](https://github.com/bitloi)
- [@danparizher](https://github.com/danparizher)
- [@chinar-amrutkar](https://github.com/chinar-amrutkar)
- [@second-ed](https://github.com/second-ed)
- [@getehen](https://github.com/getehen)
- [@Redovo1](https://github.com/Redovo1)
- [@matthewlloyd](https://github.com/matthewlloyd)
- [@zanieb](https://github.com/zanieb)
- [@InSyncWithFoo](https://github.com/InSyncWithFoo)
- [@RenzoMXD](https://github.com/RenzoMXD)

Renovate-Branch: renovate/2024.6-ruff-0.15.x
Change-Id: Id4bd542d4f128b509284d9dcda312f2b39c29964
Priv-Id: 28ebcacdeffa50cec7a52eee59091a75ca5e9539
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ntBre ntBre ntBre left review comments
@charliermarsh charliermarsh charliermarsh approved these changes

Assignees

@ntBre ntBre

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

SIM105 should be suppressed for except* in Python 3.11

3 participants

@getehen @charliermarsh @ntBre