Skip to content

[flake8-pyi] Fix PYI034 autofix for parenthesized self annotations - #30173

Merged
MichaReiser merged 2 commits into
astral-sh:mainfrom
mati-caliz:pyi034-parenthesized-self-annotation
Nov 9, 2026
Merged

MichaReiser merged 2 commits into
astral-sh:mainfrom
mati-caliz:pyi034-parenthesized-self-annotation

Conversation

@mati-caliz

@mati-caliz mati-caliz commented Nov 7, 2026 •

Copy link
Copy Markdown
Contributor

Summary

The fix deleted the self annotation from the end of the parameter name to the end of the annotation expression, whose range doesn't include surrounding parentheses, so self: (C) became self). It now deletes up to the end of the parameter instead, whose range does include them, however many there are. Without parentheses the range is the same as before.

Fixes #30171

Test Plan

I added a class with __enter__ (one level of parentheses) and __iadd__ (two levels) to the fixture.

@mati-caliz
mati-caliz marked this pull request as ready for review November 7, 2026 17:12

@MichaReiser MichaReiser left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thank you

Comment on lines +280 to +283
let annotation_end =
parenthesized_range(annotation.into(), first.as_parameter().into(), tokens)
.unwrap_or(annotation.range())
.end();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I believe we can use first.as_parameter().end() instead of parenthesized_range(...).end() here instead

@mati-caliz mati-caliz Nov 9, 2026 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Good call, the parameter's range already ends after the closing parentheses, so the tokens aren't needed. Done in 5b121cc.

@MichaReiser MichaReiser added fixes Related to suggested fixes for violations bug An issue describing something that isn't working, or a PR that fixes a bug labels Nov 9, 2026
@mati-caliz
mati-caliz force-pushed the pyi034-parenthesized-self-annotation branch from 6681711 to 5b121cc Compare November 9, 2026 12:44
@MichaReiser
MichaReiser enabled auto-merge (squash) November 9, 2026 12:50
@MichaReiser
MichaReiser merged commit 6c73638 into astral-sh:main Nov 9, 2026
58 checks passed
rlichtenwalter added a commit to rlichtenwalter/dir2text that referenced this pull request Nov 13, 2026
This PR contains the following updates:

| Package | Type | Update | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|---|---|
| [DavidAnson/markdownlint-cli2](https://github.com/DavidAnson/markdownlint-cli2) | repository | patch | `v0.24.0` → `v0.24.1` | ![age](https://developer.mend.io/api/mc/badges/age/github-tags/DavidAnson%2fmarkdownlint-cli2/v0.24.1?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/github-tags/DavidAnson%2fmarkdownlint-cli2/v0.24.0/v0.24.1?slim=true) |
| [rbubley/mirrors-prettier](https://github.com/rbubley/mirrors-prettier) | repository | minor | `v3.9.10` → `v3.10.1` | ![age](https://developer.mend.io/api/mc/badges/age/github-tags/rbubley%2fmirrors-prettier/v3.10.1?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/github-tags/rbubley%2fmirrors-prettier/v3.9.10/v3.10.1?slim=true) |
| [ruff](https://docs.astral.sh/ruff) ([source](https://github.com/astral-sh/ruff), [changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)) | dependency-groups | patch | `==0.17.3` → `==0.17.5` | ![age](https://developer.mend.io/api/mc/badges/age/pypi/ruff/0.17.5?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/ruff/0.17.3/0.17.5?slim=true) |

Note: The `pre-commit` manager in Renovate is not supported by the `pre-commit` maintainers or community. Please do not report any problems there, instead [create a Discussion in the Renovate repository](https://github.com/renovatebot/renovate/discussions/new) if you have any questions.

---

### Release Notes

<details>
<summary>DavidAnson/markdownlint-cli2</summary>

### [`v0.24.1`](DavidAnson/markdownlint-cli2@v0.24.0...v0.24.1)

[Compare Source](DavidAnson/markdownlint-cli2@v0.24.0...v0.24.1)

</details>

<details>
<summary>rbubley/mirrors-prettier</summary>

### [`v3.10.1`](rbubley/mirrors-prettier@v3.10.0...v3.10.1)

[Compare Source](rbubley/mirrors-prettier@v3.10.0...v3.10.1)

### [`v3.10.0`](rbubley/mirrors-prettier@v3.9.10...v3.10.0)

[Compare Source](rbubley/mirrors-prettier@v3.9.10...v3.10.0)

</details>

<details>
<summary>astral-sh/ruff (ruff)</summary>

### [`v0.17.5`](https://github.com/astral-sh/ruff/blob/HEAD/CHANGELOG.md#0175)

[Compare Source](astral-sh/ruff@0.17.4...0.17.5)

Released on 2026-11-12.

##### Preview features

- Redirect renamed rules ([#&#8203;30081](astral-sh/ruff#30081))
- \[`flake8-async`] Implement `pytest-raises-exception-group` (`ASYNC401`) ([#&#8203;28772](astral-sh/ruff#28772))
- \[`flake8-logging-format`] Mark `G004` fix as unsafe ([#&#8203;30087](astral-sh/ruff#30087))
- \[`pylint`] Implement `no-method-argument` (`PLE0211`) ([#&#8203;29748](astral-sh/ruff#29748))
- \[`refurb`] Do not offer fix when `write` is nested in an expression (`FURB103`) ([#&#8203;29789](astral-sh/ruff#29789))
- \[`ruff`] Add `renamed-rule` (`RUF202`) ([#&#8203;30079](astral-sh/ruff#30079))
- \[`ruff`] Expand `redirected-noqa` to other suppression comments (`RUF101`) ([#&#8203;30078](astral-sh/ruff#30078))

##### Bug fixes

- Avoid crashing when Ruff logs to a closed stderr pipe ([#&#8203;30209](astral-sh/ruff#30209))
- Fix fixes that add or remove a keyword argument with a parenthesized value ([#&#8203;30189](astral-sh/ruff#30189))
- \[`flake8-import-conventions`] Avoid shadowing names when fixing import aliases (`ICN001`) ([#&#8203;30035](astral-sh/ruff#30035))
- \[`flake8-bugbear`] Fix `B010` autofix for parenthesized `setattr` calls ([#&#8203;30168](astral-sh/ruff#30168))
- \[`flake8-pyi`] Fix `PYI034` autofix for parenthesized `self` annotations ([#&#8203;30173](astral-sh/ruff#30173))
- \[`pyupgrade`] Fix `UP031` duplicating closing parentheses around the format string ([#&#8203;30172](astral-sh/ruff#30172))

##### Rule changes

- \[`flake8-bugbear`] Ignore frozen dataclass instantiations (`B008`) ([#&#8203;29231](astral-sh/ruff#29231))

##### Performance

- Various performance improvements ([#&#8203;30375](astral-sh/ruff#30375), [#&#8203;30211](astral-sh/ruff#30211), [#&#8203;30368](astral-sh/ruff#30368), [#&#8203;30259](astral-sh/ruff#30259), [#&#8203;30354](astral-sh/ruff#30354), [#&#8203;30115](astral-sh/ruff#30115), [#&#8203;30133](astral-sh/ruff#30133), [#&#8203;30132](astral-sh/ruff#30132), [#&#8203;30358](astral-sh/ruff#30358), [#&#8203;30135](astral-sh/ruff#30135), [#&#8203;30369](astral-sh/ruff#30369), [#&#8203;30351](astral-sh/ruff#30351), [#&#8203;30352](astral-sh/ruff#30352), [#&#8203;30347](astral-sh/ruff#30347), [#&#8203;30379](astral-sh/ruff#30379), [#&#8203;30328](astral-sh/ruff#30328), [#&#8203;30329](astral-sh/ruff#30329), [#&#8203;29446](astral-sh/ruff#29446))

##### Other changes

- Fix FreeBSD source builds with libc 0.2.190 ([#&#8203;30176](astral-sh/ruff#30176))

##### Contributors

- [@&#8203;rajveer3x](https://github.com/rajveer3x)
- [@&#8203;tjkuson](https://github.com/tjkuson)
- [@&#8203;hugehoo](https://github.com/hugehoo)
- [@&#8203;hector2394](https://github.com/hector2394)
- [@&#8203;ansh-rohilla](https://github.com/ansh-rohilla)
- [@&#8203;mati-caliz](https://github.com/mati-caliz)
- [@&#8203;yxshee](https://github.com/yxshee)
- [@&#8203;charliermarsh](https://github.com/charliermarsh)
- [@&#8203;MichaReiser](https://github.com/MichaReiser)
- [@&#8203;GeorgiaPreda](https://github.com/GeorgiaPreda)
- [@&#8203;G26karthik](https://github.com/G26karthik)
- [@&#8203;ntBre](https://github.com/ntBre)
- [@&#8203;s-cork](https://github.com/s-cork)

### [`v0.17.4`](https://github.com/astral-sh/ruff/blob/HEAD/CHANGELOG.md#0174)

[Compare Source](astral-sh/ruff@0.17.3...0.17.4)

Released on 2026-11-05.

##### Preview features

- \[`flake8-logging-format`] Avoid behavior changes and syntax errors in fixes (`G004`) ([#&#8203;27419](astral-sh/ruff#27419))
- \[`security`] Implement `tarfile-ignore-zeros-true` ([#&#8203;28680](astral-sh/ruff#28680))

##### Bug fixes

- Accept a bare raise before a semicolon ([#&#8203;29761](astral-sh/ruff#29761))
- Allow match identifiers after a semicolon ([#&#8203;29760](astral-sh/ruff#29760))
- Fix panic on BOM-prefixed files in diagnostic renderer ([#&#8203;30017](astral-sh/ruff#30017))
- \[`flake8-simplify`] Report collapsible `elif` clauses after a multi-statement `if` branch (`SIM102`) ([#&#8203;29814](astral-sh/ruff#29814))

##### Rule changes

- Show more nonprinting characters in diagnostic fix diffs ([#&#8203;30062](astral-sh/ruff#30062))

##### Performance

- Coalesce source slices when formatting attributes ([#&#8203;29841](astral-sh/ruff#29841))
- Collect return statements with a statement-only visitor ([#&#8203;29911](astral-sh/ruff#29911))

(PR body shortened for the merge commit; full text on the PR.)

Reviewed-on: https://git.lichtenwalter.site/rlichten/dir2text/pulls/109
Stensel8 pushed a commit to Stensel8/streamrip that referenced this pull request Nov 14, 2026
This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [pytest-asyncio](https://github.com/pytest-dev/pytest-asyncio) ([changelog](https://pytest-asyncio.readthedocs.io/en/stable/reference/changelog.html)) | `==1.4.1.post1` → `==1.5.0` | ![age](https://developer.mend.io/api/mc/badges/age/pypi/pytest-asyncio/1.5.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/pytest-asyncio/1.4.1.post1/1.5.0?slim=true) |
| [ruff](https://docs.astral.sh/ruff) ([source](https://github.com/astral-sh/ruff), [changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)) | `==0.17.4` → `==0.17.5` | ![age](https://developer.mend.io/api/mc/badges/age/pypi/ruff/0.17.5?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/ruff/0.17.4/0.17.5?slim=true) |

---

### Release Notes

<details>
<summary>pytest-dev/pytest-asyncio (pytest-asyncio)</summary>

### [`v1.5.0`](https://github.com/pytest-dev/pytest-asyncio/releases/tag/v1.5.0): pytest-asyncio v1.5.0

[Compare Source](pytest-dev/pytest-asyncio@v1.4.1.post1...v1.5.0)

### [1.5.0](https://github.com/pytest-dev/pytest-asyncio/tree/1.5.0) - 2026-11-12

#### Added

- A `fixture-scope` value for `asyncio_default_fixture_loop_scope`. With it, an asynchronous fixture without `loop_scope` uses its `scope` as its loop scope. This is the behavior of an unset option in pytest-asyncio 1.x. ([#&#8203;1095](pytest-dev/pytest-asyncio#1095))

#### Fixed

- Invalid arguments to the `asyncio` marker, including an invalid `loop_scope`, are reported with a message that names the test instead of a traceback. ([#&#8203;1584](pytest-dev/pytest-asyncio#1584))

</details>

<details>
<summary>astral-sh/ruff (ruff)</summary>

### [`v0.17.5`](https://github.com/astral-sh/ruff/blob/HEAD/CHANGELOG.md#0175)

[Compare Source](astral-sh/ruff@0.17.4...0.17.5)

Released on 2026-11-12.

##### Preview features

- Redirect renamed rules ([#&#8203;30081](astral-sh/ruff#30081))
- \[`flake8-async`] Implement `pytest-raises-exception-group` (`ASYNC401`) ([#&#8203;28772](astral-sh/ruff#28772))
- \[`flake8-logging-format`] Mark `G004` fix as unsafe ([#&#8203;30087](astral-sh/ruff#30087))
- \[`pylint`] Implement `no-method-argument` (`PLE0211`) ([#&#8203;29748](astral-sh/ruff#29748))
- \[`refurb`] Do not offer fix when `write` is nested in an expression (`FURB103`) ([#&#8203;29789](astral-sh/ruff#29789))
- \[`ruff`] Add `renamed-rule` (`RUF202`) ([#&#8203;30079](astral-sh/ruff#30079))
- \[`ruff`] Expand `redirected-noqa` to other suppression comments (`RUF101`) ([#&#8203;30078](astral-sh/ruff#30078))

##### Bug fixes

- Avoid crashing when Ruff logs to a closed stderr pipe ([#&#8203;30209](astral-sh/ruff#30209))
- Fix fixes that add or remove a keyword argument with a parenthesized value ([#&#8203;30189](astral-sh/ruff#30189))
- \[`flake8-import-conventions`] Avoid shadowing names when fixing import aliases (`ICN001`) ([#&#8203;30035](astral-sh/ruff#30035))
- \[`flake8-bugbear`] Fix `B010` autofix for parenthesized `setattr` calls ([#&#8203;30168](astral-sh/ruff#30168))
- \[`flake8-pyi`] Fix `PYI034` autofix for parenthesized `self` annotations ([#&#8203;30173](astral-sh/ruff#30173))
- \[`pyupgrade`] Fix `UP031` duplicating closing parentheses around the format string ([#&#8203;30172](astral-sh/ruff#30172))

##### Rule changes

- \[`flake8-bugbear`] Ignore frozen dataclass instantiations (`B008`) ([#&#8203;29231](astral-sh/ruff#29231))

##### Performance

- Various performance improvements ([#&#8203;30375](astral-sh/ruff#30375), [#&#8203;30211](astral-sh/ruff#30211), [#&#8203;30368](astral-sh/ruff#30368), [#&#8203;30259](astral-sh/ruff#30259), [#&#8203;30354](astral-sh/ruff#30354), [#&#8203;30115](astral-sh/ruff#30115), [#&#8203;30133](astral-sh/ruff#30133), [#&#8203;30132](astral-sh/ruff#30132), [#&#8203;30358](astral-sh/ruff#30358), [#&#8203;30135](astral-sh/ruff#30135), [#&#8203;30369](astral-sh/ruff#30369), [#&#8203;30351](astral-sh/ruff#30351), [#&#8203;30352](astral-sh/ruff#30352), [#&#8203;30347](astral-sh/ruff#30347), [#&#8203;30379](astral-sh/ruff#30379), [#&#8203;30328](astral-sh/ruff#30328), [#&#8203;30329](astral-sh/ruff#30329), [#&#8203;29446](astral-sh/ruff#29446))

##### Other changes

- Fix FreeBSD source builds with libc 0.2.190 ([#&#8203;30176](astral-sh/ruff#30176))

##### Contributors

- [@&#8203;rajveer3x](https://github.com/rajveer3x)
- [@&#8203;tjkuson](https://github.com/tjkuson)
- [@&#8203;hugehoo](https://github.com/hugehoo)
- [@&#8203;hector2394](https://github.com/hector2394)
- [@&#8203;ansh-rohilla](https://github.com/ansh-rohilla)
- [@&#8203;mati-caliz](https://github.com/mati-caliz)
- [@&#8203;yxshee](https://github.com/yxshee)
- [@&#8203;charliermarsh](https://github.com/charliermarsh)
- [@&#8203;MichaReiser](https://github.com/MichaReiser)
- [@&#8203;GeorgiaPreda](https://github.com/GeorgiaPreda)
- [@&#8203;G26karthik](https://github.com/G26karthik)
- [@&#8203;ntBre](https://github.com/ntBre)
- [@&#8203;s-cork](https://github.com/s-cork)

</details>

---

### Configuration

📅 **Schedule**: (in timezone Europe/Amsterdam)

- Branch creation
  - At any time (no schedule defined)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate CLI](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4zOS4yIiwidXBkYXRlZEluVmVyIjoiNDQuMzkuMiIsInRhcmdldEJyYW5jaCI6ImRldiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJweXRob24iXX0=-->

Reviewed-on: https://opencommit.eu/Stensel8/streamrip/pulls/114
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug An issue describing something that isn't working, or a PR that fixes a bug fixes Related to suggested fixes for violations

Projects

None yet

Development

Successfully merging this pull request may close these issues.

PYI034 fix leaves an extra parenthesis when the self annotation is parenthesized

2 participants