Replace tuples with type union in isinstance or issubclass calls #3280

martinlehoux · 2023-02-28T19:56:40Z

Implement PEP 604 rewrites for isinstance and issubclass checks #2923

crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs

martinlehoux · 2023-03-02T20:08:42Z

Does it look better now? Maybe an idea for the violation message?

charliermarsh · 2023-03-02T20:59:17Z

Looks good :)

…tral-sh#3280)

andersk · 2023-03-03T21:50:50Z

This only works in Python 3.10+ and needs to be conditional on target_version >= PythonVersion::Py310.

charliermarsh · 2023-03-03T21:51:45Z

Ah sorry, just an oversight on my part.

charliermarsh · 2023-03-03T21:52:06Z

(Hasn't gone out yet, will fix before next release.)

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [ruff](https://togithub.com/charliermarsh/ruff) | `^0.0.253` -> `^0.0.254` | [![age](https://badges.renovateapi.com/packages/pypi/ruff/0.0.254/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/ruff/0.0.254/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/ruff/0.0.254/compatibility-slim/0.0.253)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/ruff/0.0.254/confidence-slim/0.0.253)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>charliermarsh/ruff</summary> ### [`v0.0.254`](https://togithub.com/charliermarsh/ruff/releases/tag/v0.0.254) [Compare Source](https://togithub.com/charliermarsh/ruff/compare/v0.0.253...v0.0.254)  #### What's Changed ##### Rules - \[`pyupgrade`] Replace tuples with type union in isinstance or issubclass calls by [@martinlehoux](https://togithub.com/martinlehoux) in [astral-sh/ruff#3280 - \[`flake8-pyi`] Add flake-pyi PYI033 "Do not use type comments in stubs" by [@konstin](https://togithub.com/konstin) in [astral-sh/ruff#3302 - \[`flake8-pyi`] PYI006 bad version info comparison by [@konstin](https://togithub.com/konstin) in [astral-sh/ruff#3291 - \[`pycodestyle`] feat(E251,E252): add rules by [@carlosmiei](https://togithub.com/carlosmiei) in [astral-sh/ruff#3274 - \[`pycodestyle`] feat(E211): add rule + autofix by [@carlosmiei](https://togithub.com/carlosmiei) in [astral-sh/ruff#3313 - \[`pycodestyle`] feat(e225,226,227,228): add rules by [@carlosmiei](https://togithub.com/carlosmiei) in [astral-sh/ruff#3300 - \[`pycodestyle`] feat(W191): add indentation_contains_tabs by [@carlosmiei](https://togithub.com/carlosmiei) in [astral-sh/ruff#3249 - Redirect `RUF004` to `B026` by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3293 ##### CLI - Add a `--ignore-noqa` CLI flag to force-ignore noqa directives by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3296 ##### Settings - Implement `property-decorators` configuration option for pydocstyle by [@staticssleever668](https://togithub.com/staticssleever668) in [astral-sh/ruff#3311 - Always include `@classmethod` and `@staticmethod` in decorator lists by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3314 - Detect quote style ignoring docstrings by [@bz2](https://togithub.com/bz2) in [astral-sh/ruff#3306 ##### Bug Fixes - Deduplicate SIM116 errors by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3260 - Don't flag keyword-based logging format strings by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3261 - Avoid raising TRY200 violations within new scopes by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3275 - Use expression span for yoda-conditions fixes by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3276 - Avoid PEP 585 rewrites when builtins are shadowed by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3286 - Ignore unused imports in ModuleNotFoundError blocks by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3288 - Treat function type annotations within classes as runtime-required by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3312 - Extend `RET503` autofixes to "end of statement", including comments by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3324 - Handle empty NamedTuple and TypedDict conversions by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3251 - Use `identifier_range` for a few more rules by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3254 - Match non-lowercase with S105 again by [@scop](https://togithub.com/scop) in [astral-sh/ruff#3258 - Abort when unable to fix relative imports past module root by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3319 - Use presence of convention-specific sections during docstring inference by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3325 - Treat callables within type definitions as default-non-types by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3329 - Explicitly put `Path(...)` in Pathlib violations by [@evanrittenhouse](https://togithub.com/evanrittenhouse) in [astral-sh/ruff#3333 #### New Contributors - [@rouge8](https://togithub.com/rouge8) made their first contribution in [astral-sh/ruff#3277 - [@staticssleever668](https://togithub.com/staticssleever668) made their first contribution in [astral-sh/ruff#3311 - [@bz2](https://togithub.com/bz2) made their first contribution in [astral-sh/ruff#3306 - [@evanrittenhouse](https://togithub.com/evanrittenhouse) made their first contribution in [astral-sh/ruff#3333 **Full Changelog**: astral-sh/ruff@v0.0.253...v0.0.254 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/ixm-one/pytest-cmake-presets).  Signed-off-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [ruff](https://togithub.com/charliermarsh/ruff) | `==0.0.253` -> `==0.0.254` | [![age](https://badges.renovateapi.com/packages/pypi/ruff/0.0.254/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/ruff/0.0.254/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/ruff/0.0.254/compatibility-slim/0.0.253)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/ruff/0.0.254/confidence-slim/0.0.253)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>charliermarsh/ruff</summary> ### [`v0.0.254`](https://togithub.com/charliermarsh/ruff/releases/tag/v0.0.254) [Compare Source](https://togithub.com/charliermarsh/ruff/compare/v0.0.253...v0.0.254)  ##### What's Changed ##### Rules - \[`pyupgrade`] Replace tuples with type union in isinstance or issubclass calls by [@martinlehoux](https://togithub.com/martinlehoux) in [astral-sh/ruff#3280 - \[`flake8-pyi`] Add flake-pyi PYI033 "Do not use type comments in stubs" by [@konstin](https://togithub.com/konstin) in [astral-sh/ruff#3302 - \[`flake8-pyi`] PYI006 bad version info comparison by [@konstin](https://togithub.com/konstin) in [astral-sh/ruff#3291 - \[`pycodestyle`] feat(E251,E252): add rules by [@carlosmiei](https://togithub.com/carlosmiei) in [astral-sh/ruff#3274 - \[`pycodestyle`] feat(E211): add rule + autofix by [@carlosmiei](https://togithub.com/carlosmiei) in [astral-sh/ruff#3313 - \[`pycodestyle`] feat(e225,226,227,228): add rules by [@carlosmiei](https://togithub.com/carlosmiei) in [astral-sh/ruff#3300 - \[`pycodestyle`] feat(W191): add indentation_contains_tabs by [@carlosmiei](https://togithub.com/carlosmiei) in [astral-sh/ruff#3249 - Redirect `RUF004` to `B026` by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3293 ##### CLI - Add a `--ignore-noqa` CLI flag to force-ignore noqa directives by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3296 ##### Settings - Implement `property-decorators` configuration option for pydocstyle by [@staticssleever668](https://togithub.com/staticssleever668) in [astral-sh/ruff#3311 - Always include `@classmethod` and `@staticmethod` in decorator lists by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3314 - Detect quote style ignoring docstrings by [@bz2](https://togithub.com/bz2) in [astral-sh/ruff#3306 ##### Bug Fixes - Deduplicate SIM116 errors by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3260 - Don't flag keyword-based logging format strings by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3261 - Avoid raising TRY200 violations within new scopes by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3275 - Use expression span for yoda-conditions fixes by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3276 - Avoid PEP 585 rewrites when builtins are shadowed by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3286 - Ignore unused imports in ModuleNotFoundError blocks by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3288 - Treat function type annotations within classes as runtime-required by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3312 - Extend `RET503` autofixes to "end of statement", including comments by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3324 - Handle empty NamedTuple and TypedDict conversions by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3251 - Use `identifier_range` for a few more rules by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3254 - Match non-lowercase with S105 again by [@scop](https://togithub.com/scop) in [astral-sh/ruff#3258 - Abort when unable to fix relative imports past module root by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3319 - Use presence of convention-specific sections during docstring inference by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3325 - Treat callables within type definitions as default-non-types by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3329 - Explicitly put `Path(...)` in Pathlib violations by [@evanrittenhouse](https://togithub.com/evanrittenhouse) in [astral-sh/ruff#3333 ##### New Contributors - [@rouge8](https://togithub.com/rouge8) made their first contribution in [astral-sh/ruff#3277 - [@staticssleever668](https://togithub.com/staticssleever668) made their first contribution in [astral-sh/ruff#3311 - [@bz2](https://togithub.com/bz2) made their first contribution in [astral-sh/ruff#3306 - [@evanrittenhouse](https://togithub.com/evanrittenhouse) made their first contribution in [astral-sh/ruff#3333 **Full Changelog**: astral-sh/ruff@v0.0.253...v0.0.254 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/allenporter/flux-local).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

martinlehoux force-pushed the github-2923 branch 2 times, most recently from bd15992 to 3c241fb Compare February 28, 2023 21:24

charliermarsh reviewed Mar 1, 2023

View reviewed changes

crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs Outdated Show resolved Hide resolved

charliermarsh reviewed Mar 1, 2023

View reviewed changes

crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs Outdated Show resolved Hide resolved

charliermarsh marked this pull request as ready for review March 1, 2023 23:26

martinlehoux force-pushed the github-2923 branch from 3c241fb to 7bba282 Compare March 2, 2023 19:59

Replace tuples with type union in isinstance or issubclass calls (#2923)

2558384

martinlehoux force-pushed the github-2923 branch from 7bba282 to 2558384 Compare March 2, 2023 20:07

Rename, etc.

ea86edf

charliermarsh merged commit 886992c into astral-sh:main Mar 2, 2023

charliermarsh added the rule Implementing or modifying a lint rule label Mar 2, 2023

martinlehoux deleted the github-2923 branch March 2, 2023 21:30

sasanjac pushed a commit to sasanjac-lab/ruff that referenced this pull request Mar 2, 2023

Replace tuples with type union in isinstance or issubclass calls (as…

cd12a29

…tral-sh#3280)

This was referenced Mar 3, 2023

Gate PEP 646 isinstance checks on Python version #3326

Closed

Implement PEP 604 rewrites for isinstance and issubclass checks #2923

Closed

epenet mentioned this pull request Mar 7, 2023

Bump ruff to 0.0.254 home-assistant/core#89273

Merged

19 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace tuples with type union in isinstance or issubclass calls #3280

Replace tuples with type union in isinstance or issubclass calls #3280

martinlehoux commented Feb 28, 2023

martinlehoux commented Mar 2, 2023

charliermarsh commented Mar 2, 2023

andersk commented Mar 3, 2023

charliermarsh commented Mar 3, 2023

charliermarsh commented Mar 3, 2023

Replace tuples with type union in isinstance or issubclass calls #3280

Replace tuples with type union in isinstance or issubclass calls #3280

Conversation

martinlehoux commented Feb 28, 2023

martinlehoux commented Mar 2, 2023

charliermarsh commented Mar 2, 2023

andersk commented Mar 3, 2023

charliermarsh commented Mar 3, 2023

charliermarsh commented Mar 3, 2023